ui/views: Remove the latest dependencies on chrome/ from views's targ…

…ets. Targets in views should not depend on chrome's packed_resources target. Depending on chrome's target is a layer violation, so we should break that dependency. BUG=144345 TEST=views_examples_with_content_exe R=sky@chromium.org Review URL: https://codereview.chromium.org/70453006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234843 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Nov 13, 2013 · 1653521 · 1653521
1 parent a38e343
commit 1653521
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ui/views/examples/content_client/examples_main_delegate.cc b/ui/views/examples/content_client/examples_main_delegate.cc
@@ -67,7 +67,13 @@ content::ContentBrowserClient*
 }
 
 void ExamplesMainDelegate::InitializeResourceBundle() {
-  ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+  base::FilePath pak_dir;
+  PathService::Get(base::DIR_MODULE, &pak_dir);
+
+  base::FilePath pak_file;
+  pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 }
 
 }  // namespace examples

diff --git a/ui/views/views.gyp b/ui/views/views.gyp
@@ -862,14 +862,14 @@
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
-        '../../chrome/chrome_resources.gyp:packed_resources',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
+        '../ui.gyp:ui_test_pak',
         'views',
       ],
       'include_dirs': [
@@ -954,7 +954,6 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
-        '../../chrome/chrome_resources.gyp:packed_resources',
         '../../content/content.gyp:content',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
@@ -964,6 +963,7 @@
         '../gfx/gfx.gyp:gfx',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
+        '../ui.gyp:ui_test_pak',
         'controls/webview/webview.gyp:webview',
         'views',
       ],
@@ -1044,7 +1044,6 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
-        '../../chrome/chrome_resources.gyp:packed_resources',
         '../../content/content.gyp:content',
         '../../content/content_shell_and_tests.gyp:content_shell_lib',
         '../../content/content_shell_and_tests.gyp:test_support_content',
@@ -1056,6 +1055,7 @@
         '../shell/shell.gyp:shell',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
+        '../ui.gyp:ui_test_pak',
         'views',
         'views_examples_with_content_lib',
         'views_test_support'