diff options
| author | Hokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 06:21:00 +0000 |
|---|---|---|
| committer | Hokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 06:21:00 +0000 |
| commit | d10cee1686b0e6cec09fbbcc859eab3ce646102f (patch) | |
| tree | bdb2280461c39f9d998e076bec20f56ab7f0b05a /apps | |
| parent | aef892fd95737f4db7b27695f99a228149514466 (diff) | |
| download | chromium_src-d10cee1686b0e6cec09fbbcc859eab3ce646102f.zip chromium_src-d10cee1686b0e6cec09fbbcc859eab3ce646102f.tar.gz chromium_src-d10cee1686b0e6cec09fbbcc859eab3ce646102f.tar.bz2 | |
[App Shell] Remove chrome_100_percent.pak dependancy.
Now app::ShellMainDelegate initializes with chrome_100_percent.pak
by default. This patch is to remove this dependancy by add all
chrome-specific resources to app_shell.pak.
BUG=348484
Review URL: https://codereview.chromium.org/176873016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.gypi | 25 | ||||
| -rw-r--r-- | apps/shell/app/shell_main_delegate.cc | 6 |
2 files changed, 22 insertions, 9 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index e0031fb..367835b 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -103,11 +103,17 @@ 'target_name': 'app_shell_pak', 'type': 'none', 'dependencies': [ - # Need dev-tools related resources in shell_resources.pak and devtools_resources.pak. + # Need extension related resources in common_resources.pak and + # renderer_resources_100_percent.pak + 'chrome_resources.gyp:chrome_resources', + # Need app related resources in theme_resources_100_percent.pak + 'chrome_resources.gyp:theme_resources', + # Need dev-tools related resources in shell_resources.pak and + # devtools_resources.pak. '../content/content_shell_and_tests.gyp:generate_content_shell_resources', '../content/browser/devtools/devtools_resources.gyp:devtools_resources', - # Need features JSON files in common_resources.pak. - 'chrome_resources.gyp:chrome_resources', + '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/resources/ui_resources.gyp:ui_resources', ], 'variables': { 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', @@ -117,10 +123,19 @@ 'action_name': 'repack_app_shell_pack', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(grit_out_dir)/common_resources.pak', '<(grit_out_dir)/extensions_api_resources.pak', + # TODO(jamescook): extra the extension/app related resources + # from generated_resources_en-US.pak and + # theme_resources_100_percent.pak. + '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', ], }, 'inputs': [ diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc index 4c7650a..13706cd 100644 --- a/apps/shell/app/shell_main_delegate.cc +++ b/apps/shell/app/shell_main_delegate.cc @@ -87,12 +87,10 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle( } void ShellMainDelegate::InitializeResourceBundle() { - ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); - base::FilePath pak_dir; PathService::Get(base::DIR_MODULE, &pak_dir); - ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( - pak_dir.AppendASCII("app_shell.pak"), ui::SCALE_FACTOR_NONE); + ui::ResourceBundle::InitSharedInstanceWithPakPath( + pak_dir.AppendASCII("app_shell.pak")); } } // namespace apps |