ReloadSharedInstance() added to change the locale on the live system.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1648004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44498 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/app/resource_bundle_posix.cc b/app/resource_bundle_posix.cc
index 5b1fb3c..1246087 100644
--- a/app/resource_bundle_posix.cc
+++ b/app/resource_bundle_posix.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -30,12 +30,16 @@ ResourceBundle::~ResourceBundle() {
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   FreeGdkPixBufs();
 #endif
-  delete locale_resources_data_;
-  locale_resources_data_ = NULL;
+  UnloadLocaleResources();
   delete resources_data_;
   resources_data_ = NULL;
 }
 
+void ResourceBundle::UnloadLocaleResources() {
+  delete locale_resources_data_;
+  locale_resources_data_ = NULL;
+}
+
 // static
 RefCountedStaticMemory* ResourceBundle::LoadResourceBytes(
     DataHandle module, int resource_id) {
@@ -80,13 +84,16 @@ string16 ResourceBundle::GetLocalizedString(int message_id) {
   return msg;
 }
 
-std::string ResourceBundle::LoadResources(const std::wstring& pref_locale) {
+void ResourceBundle::LoadCommonResources() {
   DCHECK(!resources_data_) << "chrome.pak already loaded";
   FilePath resources_file_path = GetResourcesFilePath();
   CHECK(!resources_file_path.empty()) << "chrome.pak not found";
   resources_data_ = LoadResourcesDataPak(resources_file_path);
   CHECK(resources_data_) << "failed to load chrome.pak";
+}
 
+std::string ResourceBundle::LoadLocaleResources(
+    const std::wstring& pref_locale) {
   DCHECK(!locale_resources_data_) << "locale.pak already loaded";
   std::string app_locale = l10n_util::GetApplicationLocale(pref_locale);
   FilePath locale_file_path = GetLocaleFilePath(app_locale);