summaryrefslogtreecommitdiffstats
path: root/remoting/host/host_window.h
diff options
context:
space:
mode:
authoralexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 23:04:24 +0000
committeralexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 23:04:24 +0000
commit93cfcc6f75ffd86895a6f95013b7df8becccfb91 (patch)
treedec5252259e825efd3db95cd7096880b0df54f01 /remoting/host/host_window.h
parent40f42682afc1bd543f9fde452f7f1f20fcf55492 (diff)
downloadchromium_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/host_window.h')
-rw-r--r--remoting/host/host_window.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/remoting/host/host_window.h b/remoting/host/host_window.h
index d193686..243f9ba 100644
--- a/remoting/host/host_window.h
+++ b/remoting/host/host_window.h
@@ -14,16 +14,19 @@
namespace remoting {
class ClientSessionControl;
+struct UiStrings;
class HostWindow : public base::NonThreadSafe {
public:
virtual ~HostWindow() {}
// Creates a platform-specific instance of the continue window.
- static scoped_ptr<HostWindow> CreateContinueWindow();
+ static scoped_ptr<HostWindow> CreateContinueWindow(
+ const UiStrings& ui_strings);
// Creates a platform-specific instance of the disconnect window.
- static scoped_ptr<HostWindow> CreateDisconnectWindow();
+ static scoped_ptr<HostWindow> CreateDisconnectWindow(
+ const UiStrings& ui_strings);
// Starts the UI state machine. |client_session_control| will be used to
// notify the caller about the local user's actions.