diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 01:52:34 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 01:52:34 +0000 |
| commit | 80be1cece8e578e54d694f918b074ae6395f69fa (patch) | |
| tree | bf3b57bff9c8070ba7943af84bc3373fe9a01ee5 /remoting/base | |
| parent | fc2f1d08441c382a04a7c2d8865bcfa2a06a93b6 (diff) | |
| download | chromium_src-80be1cece8e578e54d694f918b074ae6395f69fa.zip chromium_src-80be1cece8e578e54d694f918b074ae6395f69fa.tar.gz chromium_src-80be1cece8e578e54d694f918b074ae6395f69fa.tar.bz2 | |
Revert 168349 - Native remoting host configurer for linux.
This is initial version of the remoting host configurer for linux. It doesn't look pretty yet,
but it works.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167794
Review URL: https://codereview.chromium.org/11260004
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11413051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/resources.cc | 4 | ||||
| -rw-r--r-- | remoting/base/resources.h | 6 |
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 |