diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 16:34:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 16:34:40 +0000 |
| commit | 02b2c90e60f69349bb300134539dca37a398cacd (patch) | |
| tree | af938cebc68e94ed1c4c9fd7e86489b46b00b035 /extensions/shell/app | |
| parent | ce49c9e780ed54eafb35d39b13eabe4fe3176392 (diff) | |
| download | chromium_src-02b2c90e60f69349bb300134539dca37a398cacd.zip chromium_src-02b2c90e60f69349bb300134539dca37a398cacd.tar.gz chromium_src-02b2c90e60f69349bb300134539dca37a398cacd.tar.bz2 | |
extensions: Combine extensions_pak with app_shell_pak
Use the same .pak file for both app_shell and
extensions_unittests by merging app_shell_pak into extensions_pak.
BUG=397250,394469
TEST=extensions_unittests and app_shell
R=jamescook@chromium.org
TBR=yoz@chromium.org
Review URL: https://codereview.chromium.org/418283006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/shell/app')
| -rw-r--r-- | extensions/shell/app/shell_main_delegate.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc index b3b6ceb..c49319e 100644 --- a/extensions/shell/app/shell_main_delegate.cc +++ b/extensions/shell/app/shell_main_delegate.cc @@ -89,10 +89,11 @@ ShellMainDelegate::CreateShellRendererMainDelegate() { } void ShellMainDelegate::InitializeResourceBundle() { - base::FilePath pak_dir; - PathService::Get(base::DIR_MODULE, &pak_dir); + base::FilePath extensions_shell_and_test_pak_path; + PathService::Get(base::DIR_MODULE, &extensions_shell_and_test_pak_path); ui::ResourceBundle::InitSharedInstanceWithPakPath( - pak_dir.AppendASCII("app_shell.pak")); + extensions_shell_and_test_pak_path.AppendASCII( + "extensions_shell_and_test.pak")); } // static |