From ae7f7846ea0d236b69e612bbf9abcedb23b2bf31 Mon Sep 17 00:00:00 2001 From: "alexeypa@google.com" Date: Tue, 30 Jul 2013 18:43:25 +0000 Subject: Revert 214379 "Localized Chromoting Host on Mac and Linux." The CL broke "Google Chrome Win" in a strange way: http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/19799/steps/compile/logs/stdio 671> Traceback (most recent call last): 671> File "webapp/build-webapp.py", line 331, in 671> sys.exit(main()) 671> File "webapp/build-webapp.py", line 327, in main 671> sys.argv[5], sys.argv[6], files, locales, patches) 671> File "webapp/build-webapp.py", line 141, in buildWebApp 671> shutil.copy2(current_locale, destination_file) 671> File "c:\b\build\slave\google-chrome-rel-win\build\src\third_party\python_26\lib\shutil.py", line 99, in copy2 671> copyfile(src, dst) 671> File "c:\b\build\slave\google-chrome-rel-win\build\src\third_party\python_26\lib\shutil.py", line 52, in copyfile 671> fsrc = open(src, 'rb') 671> IOError: [Errno 2] No such file or directory: 'c:/b/build/slave/google-chrome-rel-win/build/src/build/Release/\\remoting_ocales\\nl.pak' 671>C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppCommon.targets(151,5): error MSB6006: "cmd.exe" exited with code 1. > Localized Chromoting Host on Mac and Linux. > > Re-landing r213997. TBR because this is a trivial, mechanical fix. > > 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/.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 now 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. > > TBR=garykac@chromium.org > BUG=155204 > > Review URL: https://codereview.chromium.org/20985002 TBR=alexeypa@chromium.org Review URL: https://codereview.chromium.org/21090006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214401 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/host/me2me_desktop_environment.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'remoting/host/me2me_desktop_environment.h') 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 client_session_control, + const UiStrings& ui_strings, bool curtain_enabled); private: @@ -57,7 +58,8 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory { Me2MeDesktopEnvironmentFactory( scoped_refptr caller_task_runner, scoped_refptr input_task_runner, - scoped_refptr ui_task_runner); + scoped_refptr ui_task_runner, + const UiStrings& ui_strings); virtual ~Me2MeDesktopEnvironmentFactory(); // DesktopEnvironmentFactory interface. -- cgit v1.1