diff options
| author | ilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 01:28:29 +0000 |
|---|---|---|
| committer | ilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 01:28:29 +0000 |
| commit | 11bfe30b4bd2656e07765cae0253eff65121b225 (patch) | |
| tree | cbd33d135e57d0dc50ea2d8bd4d6ad81ad4afa1c /remoting/base | |
| parent | 2fcafa0b3526619bbb10f0aebd7e6a22ee9f965b (diff) | |
| download | chromium_src-11bfe30b4bd2656e07765cae0253eff65121b225.zip chromium_src-11bfe30b4bd2656e07765cae0253eff65121b225.tar.gz chromium_src-11bfe30b4bd2656e07765cae0253eff65121b225.tar.bz2 | |
Revert 167794 - 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.
This requires a new dependency and a PSA was not sent in advance to chromium-dev. It breaks
out bots because someone needs to manually run install-build-deps on each of them.
Please wait a couple days before landing. yfriedman has sent the required PSA.
Review URL: https://chromiumcodereview.appspot.com/11260004
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11362266
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167811 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 |