summaryrefslogtreecommitdiffstats
path: root/remoting/base
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/base')
-rw-r--r--remoting/base/resources.cc4
-rw-r--r--remoting/base/resources.h6
2 files changed, 4 insertions, 6 deletions
diff --git a/remoting/base/resources.cc b/remoting/base/resources.cc
index a43e328..32e62c4 100644
--- a/remoting/base/resources.cc
+++ b/remoting/base/resources.cc
@@ -17,14 +17,14 @@ const char kCommonResourcesFileName[] = "chrome_remote_desktop.pak";
} // namespace
// Loads chromoting resources.
-bool LoadResources(const std::string& pref_locale) {
+bool LoadResources(const std::string& locale) {
FilePath path;
if (!PathService::Get(base::DIR_MODULE, &path))
return false;
PathService::Override(ui::DIR_LOCALES,
path.AppendASCII(kLocaleResourcesDirName));
- ui::ResourceBundle::InitSharedInstanceLocaleOnly(pref_locale, NULL);
+ ui::ResourceBundle::InitSharedInstanceLocaleOnly(locale, NULL);
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
path.AppendASCII(kCommonResourcesFileName), ui::SCALE_FACTOR_100P);
diff --git a/remoting/base/resources.h b/remoting/base/resources.h
index b08eb8d..a8fdfd6 100644
--- a/remoting/base/resources.h
+++ b/remoting/base/resources.h
@@ -9,10 +9,8 @@
namespace remoting {
-// Loads chromoting resources. Returns false in case of a failure. |pref_locale|
-// is passed to l10n_util::GetApplicationLocale(), so the default system locale
-// is used if |pref_locale| is empty.
-bool LoadResources(const std::string& pref_locale);
+// Loads chromoting resources. Returns false in case of a failure.
+bool LoadResources(const std::string& locale);
} // namespace remoting