diff options
| author | alexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 23:04:24 +0000 |
|---|---|---|
| committer | alexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 23:04:24 +0000 |
| commit | 93cfcc6f75ffd86895a6f95013b7df8becccfb91 (patch) | |
| tree | dec5252259e825efd3db95cd7096880b0df54f01 /remoting/host/me2me_desktop_environment.h | |
| parent | 40f42682afc1bd543f9fde452f7f1f20fcf55492 (diff) | |
| download | chromium_src-93cfcc6f75ffd86895a6f95013b7df8becccfb91.zip chromium_src-93cfcc6f75ffd86895a6f95013b7df8becccfb91.tar.gz chromium_src-93cfcc6f75ffd86895a6f95013b7df8becccfb91.tar.bz2 | |
Revert 213997 "Localized Chromoting Host on Mac and Linux."
It passed CQ but broke Linux Builder. I'm filing a bug agains CQ.
> Localized Chromoting Host on Mac and Linux.
>
> This CL implements generation of localizable strings from remoting_strings.grd file. Depending on the platform the localized resources are placed to:
> - Mac: localized .string and .pak resources are added to each application bundle under 'Resources/<locale>.lproj'
> - Linux: localized .pak files are placed under 'remoting_locales' directory next to the binary locading them.
> - Windows: .rc resources are generated from .jinja2 templates and embedded into a relevant binary.
>
> Chrome l10n and i18n APIs are used to retrieve the current locale and RTL flag (Mac & Linux). The it2me plugin sets the locale to match the locale of the browser.
>
> Collateral changes:
> - UiString is not used any more.
> - Increased width of disconnect window message on Mac.
> - The host plugin version is correctly reported on Mac.
> - Dialogs use RTL templates in case of RTL languages. No more updating the templates dynamically (Windows).
> - remoting_unittests.ResourcesTest row runs on Mac, LInux and Windows.
> - '@' is used for variable substitutions by remoting_localize.py.
> - HOST_PLUGIN_MIME_TYPE is defined in one place now.
> - Deleted unused commong_resources.grd.
>
> Mac installer and preference panel are not localized yet.
>
> BUG=155204
>
> Review URL: https://chromiumcodereview.appspot.com/19803010
TBR=alexeypa@chromium.org
Review URL: https://codereview.chromium.org/20854002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/me2me_desktop_environment.h')
| -rw-r--r-- | remoting/host/me2me_desktop_environment.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/me2me_desktop_environment.h index f028664..f981a89 100644 --- a/remoting/host/me2me_desktop_environment.h +++ b/remoting/host/me2me_desktop_environment.h @@ -35,6 +35,7 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment { // and in-session UI). bool InitializeSecurity( base::WeakPtr<ClientSessionControl> client_session_control, + const UiStrings& ui_strings, bool curtain_enabled); private: @@ -57,7 +58,8 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory { Me2MeDesktopEnvironmentFactory( scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); + scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, + const UiStrings& ui_strings); virtual ~Me2MeDesktopEnvironmentFactory(); // DesktopEnvironmentFactory interface. |