diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 02:30:04 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 02:30:04 +0000 |
| commit | 70f9df11715b7903b1fe3ecf8b3e4a0909bd80cf (patch) | |
| tree | 4078be6ec7d9c222978fd27fd6db348dfcc3cb60 /ash | |
| parent | e643e57c80fa41616d4ed5d9b13381538dec0573 (diff) | |
| download | chromium_src-70f9df11715b7903b1fe3ecf8b3e4a0909bd80cf.zip chromium_src-70f9df11715b7903b1fe3ecf8b3e4a0909bd80cf.tar.gz chromium_src-70f9df11715b7903b1fe3ecf8b3e4a0909bd80cf.tar.bz2 | |
content: Modfiy ResourceBundle and content_shell to run with alternative pak files.
BUG=111326
R=jam
TBR=sky,tony,ajwong,ananta
Review URL: http://codereview.chromium.org/9232060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell/shell_main_parts.cc | 2 | ||||
| -rw-r--r-- | ash/shell/shell_main_parts_mac.mm | 2 | ||||
| -rw-r--r-- | ash/test/test_suite.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell/shell_main_parts.cc b/ash/shell/shell_main_parts.cc index e7b3a0a..9497e8c 100644 --- a/ash/shell/shell_main_parts.cc +++ b/ash/shell/shell_main_parts.cc @@ -14,7 +14,7 @@ namespace shell { void PreMainMessageLoopStart() { ui::RegisterPathProvider(); icu_util::Initialize(); - ResourceBundle::InitSharedInstance("en-US"); + ResourceBundle::InitSharedInstanceWithLocale("en-US"); } } // namespace ash diff --git a/ash/shell/shell_main_parts_mac.mm b/ash/shell/shell_main_parts_mac.mm index fc4e651..aa3f51f 100644 --- a/ash/shell/shell_main_parts_mac.mm +++ b/ash/shell/shell_main_parts_mac.mm @@ -18,7 +18,7 @@ namespace shell { void PreMainMessageLoopStart() { ui::RegisterPathProvider(); icu_util::Initialize(); - ResourceBundle::InitSharedInstance("en-US"); + ResourceBundle::InitSharedInstanceWithLocale("en-US"); scoped_nsobject<NSNib> nib([[NSNib alloc] initWithNibNamed:@"MainMenu" diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc index 9bb0835..a8a8c87 100644 --- a/ash/test/test_suite.cc +++ b/ash/test/test_suite.cc @@ -28,7 +28,7 @@ void AuraShellTestSuite::Initialize() { // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. - ui::ResourceBundle::InitSharedInstance("en-US"); + ui::ResourceBundle::InitSharedInstanceWithLocale("en-US"); ui::CompositorTestSupport::Initialize(); ui::SetupTestCompositor(); } |