diff options
author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 19:34:44 +0000 |
---|---|---|
committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 19:34:44 +0000 |
commit | 2bffdc8da6974843565a680713b851ac2c8de7be (patch) | |
tree | abc115c70c2b42825d8efc052bee04f563a21f40 /remoting | |
parent | a1c2f8f87f4d4ba6b5fb1dc22ee0d46f6d1e50d9 (diff) | |
download | chromium_src-2bffdc8da6974843565a680713b851ac2c8de7be.zip chromium_src-2bffdc8da6974843565a680713b851ac2c8de7be.tar.gz chromium_src-2bffdc8da6974843565a680713b851ac2c8de7be.tar.bz2 |
Added l10n support to Mac host dialogs.
The XIB changes involve unifying the 'connected' message and username field into a single text field and adding some links to we can access the button in order to set its text.
BUG=93088
TEST=Manual
Review URL: http://codereview.chromium.org/7796024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/host/continue_window.cc | 17 | ||||
-rw-r--r-- | remoting/host/continue_window.h | 6 | ||||
-rw-r--r-- | remoting/host/continue_window_mac.mm | 12 | ||||
-rw-r--r-- | remoting/host/disconnect_window.cc | 25 | ||||
-rw-r--r-- | remoting/host/disconnect_window.h | 8 | ||||
-rw-r--r-- | remoting/host/disconnect_window.xib | 242 | ||||
-rw-r--r-- | remoting/host/disconnect_window_mac.h | 3 | ||||
-rw-r--r-- | remoting/host/disconnect_window_mac.mm | 12 | ||||
-rw-r--r-- | remoting/host/plugin/host_script_object.cc | 2 | ||||
-rw-r--r-- | remoting/remoting.gyp | 3 |
10 files changed, 137 insertions, 193 deletions
diff --git a/remoting/host/continue_window.cc b/remoting/host/continue_window.cc deleted file mode 100644 index db7d492..0000000 --- a/remoting/host/continue_window.cc +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "remoting/host/continue_window.h" - -// TODO(jamiewalch): Remove this file once all platforms pick up the -// localized versions from ui_strings.h - -namespace remoting { -const char ContinueWindow::kTitle[] = "Remoting"; -const char ContinueWindow::kMessage[] = - "You are currently sharing this machine with another user. " - "Please confirm that you want to continue sharing."; -const char ContinueWindow::kDefaultButtonText[] = "Continue"; -const char ContinueWindow::kCancelButtonText[] = "Stop"; -} diff --git a/remoting/host/continue_window.h b/remoting/host/continue_window.h index d2eb30f..0c52416 100644 --- a/remoting/host/continue_window.h +++ b/remoting/host/continue_window.h @@ -21,12 +21,6 @@ class ContinueWindow { virtual void Hide() = 0; static ContinueWindow* Create(); - - protected: - static const char kTitle[]; - static const char kMessage[]; - static const char kDefaultButtonText[]; - static const char kCancelButtonText[]; }; } diff --git a/remoting/host/continue_window_mac.mm b/remoting/host/continue_window_mac.mm index 8793dd4..6567cc3 100644 --- a/remoting/host/continue_window_mac.mm +++ b/remoting/host/continue_window_mac.mm @@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_nsobject.h" +#include "base/sys_string_conversions.h" #include "remoting/host/chromoting_host.h" // As this is a plugin, there needs to be a way to find its bundle @@ -65,11 +66,12 @@ void ContinueWindowMac::Show(remoting::ChromotingHost* host) { } // Put up alert - NSString* message = [NSString stringWithUTF8String:kMessage]; - NSString* continue_button = - [NSString stringWithUTF8String:kDefaultButtonText]; - NSString* cancel_button = - [NSString stringWithUTF8String:kCancelButtonText]; + const UiStrings& strings = host->ui_strings(); + NSString* message = base::SysUTF16ToNSString(strings.continue_prompt); + NSString* continue_button = base::SysUTF16ToNSString( + strings.continue_button_text); + NSString* cancel_button = base::SysUTF16ToNSString( + strings.stop_sharing_button_text); scoped_nsobject<NSAlert> continue_alert([[NSAlert alloc] init]); [continue_alert setMessageText:message]; [continue_alert addButtonWithTitle:continue_button]; diff --git a/remoting/host/disconnect_window.cc b/remoting/host/disconnect_window.cc deleted file mode 100644 index 21f1683..0000000 --- a/remoting/host/disconnect_window.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "remoting/host/disconnect_window.h" - -// TODO(jamiewalch): Remove this file once all platforms pick up the -// localized versions from ui_strings.h - -namespace remoting { -const char DisconnectWindow::kTitle[] = "Remoting"; -const char DisconnectWindow::kSharingWith[] = "Sharing with: "; -const char DisconnectWindow::kDisconnectButton[] = "Disconnect"; - -const char DisconnectWindow::kDisconnectKeysLinux[] = " (Ctrl+Alt+Esc)"; -// For Mac: Ctrl+Option+Esc -// Ctrl: U+2303 = 0xE2 0x8C 0x83 (utf8) -// Option: U+2325 = 0xE2 0x8C 0xA5 (utf8) -// Escape: According to http://en.wikipedia.org/wiki/Esc_key, the ISO 9995 -// standard specifies the U+238B glyph for Escape. Although this -// doesn't appear to be in common use. -const char DisconnectWindow::kDisconnectKeysMac[] = - " (\xE2\x8C\x83+\xE2\x8C\xA5+Esc)"; -const char DisconnectWindow::kDisconnectKeysWin[] = " (Ctrl+Alt+Esc)"; -} diff --git a/remoting/host/disconnect_window.h b/remoting/host/disconnect_window.h index 6ceb671..434051f 100644 --- a/remoting/host/disconnect_window.h +++ b/remoting/host/disconnect_window.h @@ -15,14 +15,6 @@ class DisconnectWindow { public: virtual ~DisconnectWindow() {} - static const char kTitle[]; - static const char kSharingWith[]; - static const char kDisconnectButton[]; - - static const char kDisconnectKeysLinux[]; - static const char kDisconnectKeysMac[]; - static const char kDisconnectKeysWin[]; - // Show the disconnect window allowing the user to shut down |host|. virtual void Show(ChromotingHost* host, const std::string& username) = 0; diff --git a/remoting/host/disconnect_window.xib b/remoting/host/disconnect_window.xib index 2cc9ecf8..9b18f3c 100644 --- a/remoting/host/disconnect_window.xib +++ b/remoting/host/disconnect_window.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10K540</string> - <string key="IBDocument.InterfaceBuilderVersion">804</string> + <string key="IBDocument.SystemVersion">10K549</string> + <string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.AppKitVersion">1038.36</string> <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">804</string> + <string key="NS.object.0">851</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -41,7 +41,7 @@ <object class="NSWindowTemplate" id="327397516"> <int key="NSWindowStyleMask">17</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{247, 498}, {252, 60}}</string> + <string key="NSWindowRect">{{247, 442}, {279, 116}}</string> <int key="NSWTFlags">611844096</int> <string key="NSWindowTitle">Remoting</string> <string key="NSWindowClass">NSPanel</string> @@ -52,25 +52,47 @@ <int key="NSvFlags">293</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="795326084"> + <object class="NSButton" id="456006926"> <reference key="NSNextResponder" ref="1718335"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{5, 39}, {87, 17}}</string> + <int key="NSvFlags">301</int> + <string key="NSFrame">{{31, 12}, {217, 32}}</string> <reference key="NSSuperview" ref="1718335"/> - <int key="NSViewLayerContentsRedrawPolicy">2</int> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1057669935"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Sharing with:</string> - <object class="NSFont" key="NSSupport" id="549128113"> + <object class="NSButtonCell" key="NSCell" id="837573888"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"><disconnect></string> + <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> <double key="NSSize">13</double> <int key="NSfFlags">1044</int> </object> - <reference key="NSControlView" ref="795326084"/> - <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor" id="732965049"> + <reference key="NSControlView" ref="456006926"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="165586339"> + <reference key="NSNextResponder" ref="1718335"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 48}, {245, 55}}</string> + <reference key="NSSuperview" ref="1718335"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="752844448"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">272629760</int> + <string key="NSContents"><connected-to></string> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> + </object> + <reference key="NSControlView" ref="165586339"/> + <object class="NSColor" key="NSBackgroundColor"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlColor</string> @@ -79,56 +101,19 @@ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> - <object class="NSColor" key="NSTextColor" id="534725880"> + <object class="NSColor" key="NSTextColor"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlTextColor</string> - <object class="NSColor" key="NSColor" id="808353180"> + <object class="NSColor" key="NSColor"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MAA</bytes> </object> </object> </object> </object> - <object class="NSTextField" id="16341656"> - <reference key="NSNextResponder" ref="1718335"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{94, 39}, {217, 17}}</string> - <reference key="NSSuperview" ref="1718335"/> - <int key="NSViewLayerContentsRedrawPolicy">2</int> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="563331872"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"><unknown></string> - <reference key="NSSupport" ref="549128113"/> - <reference key="NSControlView" ref="16341656"/> - <reference key="NSBackgroundColor" ref="732965049"/> - <reference key="NSTextColor" ref="534725880"/> - </object> - </object> - <object class="NSButton" id="456006926"> - <reference key="NSNextResponder" ref="1718335"/> - <int key="NSvFlags">301</int> - <string key="NSFrame">{{70, 3}, {111, 32}}</string> - <reference key="NSSuperview" ref="1718335"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="837573888"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Stop sharing</string> - <reference key="NSSupport" ref="549128113"/> - <reference key="NSControlView" ref="456006926"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> </object> - <string key="NSFrameSize">{252, 60}</string> + <string key="NSFrameSize">{279, 116}</string> <reference key="NSSuperview"/> <int key="NSViewLayerContentsRedrawPolicy">2</int> </object> @@ -157,19 +142,27 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">usernameField_</string> + <string key="label">delegate</string> + <reference key="source" ref="327397516"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">22</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">connectedToField_</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="16341656"/> + <reference key="destination" ref="165586339"/> </object> - <int key="connectionID">20</int> + <int key="connectionID">25</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="327397516"/> - <reference key="destination" ref="1001"/> + <string key="label">disconnectButton_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="456006926"/> </object> - <int key="connectionID">22</int> + <int key="connectionID">26</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -213,53 +206,38 @@ <reference key="object" ref="1718335"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="795326084"/> - <reference ref="16341656"/> + <reference ref="165586339"/> <reference ref="456006926"/> </object> <reference key="parent" ref="327397516"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="795326084"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1057669935"/> - </object> - <reference key="parent" ref="1718335"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6</int> - <reference key="object" ref="1057669935"/> - <reference key="parent" ref="795326084"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7</int> - <reference key="object" ref="16341656"/> + <int key="objectID">13</int> + <reference key="object" ref="456006926"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="563331872"/> + <reference ref="837573888"/> </object> <reference key="parent" ref="1718335"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8</int> - <reference key="object" ref="563331872"/> - <reference key="parent" ref="16341656"/> + <int key="objectID">14</int> + <reference key="object" ref="837573888"/> + <reference key="parent" ref="456006926"/> </object> <object class="IBObjectRecord"> - <int key="objectID">13</int> - <reference key="object" ref="456006926"/> + <int key="objectID">23</int> + <reference key="object" ref="165586339"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="837573888"/> + <reference ref="752844448"/> </object> <reference key="parent" ref="1718335"/> </object> <object class="IBObjectRecord"> - <int key="objectID">14</int> - <reference key="object" ref="837573888"/> - <reference key="parent" ref="456006926"/> + <int key="objectID">24</int> + <reference key="object" ref="752844448"/> + <reference key="parent" ref="165586339"/> </object> </object> </object> @@ -273,21 +251,13 @@ <string>13.IBPluginDependency</string> <string>13.IBViewBoundsToFrameTransform</string> <string>14.IBPluginDependency</string> + <string>23.IBPluginDependency</string> + <string>24.IBPluginDependency</string> <string>3.IBEditorWindowLastContentRect</string> <string>3.IBPluginDependency</string> <string>3.IBWindowTemplateEditedContentRect</string> <string>3.NSWindowTemplate.visibleAtLaunch</string> <string>4.IBPluginDependency</string> - <string>5.IBPluginDependency</string> - <string>5.IBViewBoundsToFrameTransform</string> - <string>6.IBPluginDependency</string> - <string>7.IBPluginDependency</string> - <string>7.IBViewBoundsToFrameTransform</string> - <string>7.IBViewIntegration.shadowBlurRadius</string> - <string>7.IBViewIntegration.shadowColor</string> - <string>7.IBViewIntegration.shadowOffsetHeight</string> - <string>7.IBViewIntegration.shadowOffsetWidth</string> - <string>8.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -296,27 +266,15 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSAffineTransform"> - <bytes key="NSTransformStruct">P4AAAL+AAABCtgAAwgQAAA</bytes> + <bytes key="NSTransformStruct">P4AAAL+AAABBqAAAwigAAA</bytes> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{2239, 620}, {252, 60}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{2239, 620}, {252, 60}}</string> - <boolean value="NO"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{1363, 896}, {279, 116}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSAffineTransform"> - <bytes key="NSTransformStruct">P4AAAL+AAADAQAAAw70AAA</bytes> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSAffineTransform"> - <bytes key="NSTransformStruct">P4AAAL+AAABC1AAAwp4AAA</bytes> - </object> - <real value="0.0"/> - <reference ref="808353180"/> - <real value="0.0"/> - <real value="0.0"/> + <string>{{1363, 896}, {279, 116}}</string> + <boolean value="NO"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> @@ -336,7 +294,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">22</int> + <int key="maxID">26</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -356,14 +314,35 @@ </object> </object> <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">usernameField_</string> - <string key="NS.object.0">NSTextField</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>connectedToField_</string> + <string>disconnectButton_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSTextField</string> + <string>NSButton</string> + </object> </object> <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <string key="NS.key.0">usernameField_</string> - <object class="IBToOneOutletInfo" key="NS.object.0"> - <string key="name">usernameField_</string> - <string key="candidateClassName">NSTextField</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>connectedToField_</string> + <string>disconnectButton_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">connectedToField_</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">disconnectButton_</string> + <string key="candidateClassName">NSButton</string> + </object> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -371,6 +350,13 @@ <string key="minorKey">host/disconnect_window_mac.h</string> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMCarbonEvent.h</string> + </object> + </object> </object> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -914,6 +900,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSPanel</string> + <string key="superclassName">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSResponder</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h index fc6f9cb..7e1593f 100644 --- a/remoting/host/disconnect_window_mac.h +++ b/remoting/host/disconnect_window_mac.h @@ -14,7 +14,8 @@ class DisconnectWindowMac; remoting::ChromotingHost* host_; remoting::DisconnectWindowMac* disconnectWindow_; NSString* username_; - IBOutlet NSTextField* usernameField_; + IBOutlet NSTextField* connectedToField_; + IBOutlet NSButton* disconnectButton_; } - (IBAction)stopSharing:(id)sender; diff --git a/remoting/host/disconnect_window_mac.mm b/remoting/host/disconnect_window_mac.mm index 5f828d4..1312b11 100644 --- a/remoting/host/disconnect_window_mac.mm +++ b/remoting/host/disconnect_window_mac.mm @@ -7,6 +7,7 @@ #import "remoting/host/disconnect_window_mac.h" #include "base/compiler_specific.h" +#include "base/string_util.h" #include "base/sys_string_conversions.h" #include "remoting/host/chromoting_host.h" #include "remoting/host/disconnect_window.h" @@ -96,9 +97,14 @@ remoting::DisconnectWindow* remoting::DisconnectWindow::Create() { } - (void)windowDidLoad { - // TODO(jamiewalch): Resize the window to fit the username without leaving too - // much space. - [usernameField_ setStringValue:self.username]; + string16 text = ReplaceStringPlaceholders( + host_->ui_strings().disconnect_message, + base::SysNSStringToUTF16(self.username), + NULL); + [connectedToField_ setStringValue:base::SysUTF16ToNSString(text)]; + + [disconnectButton_ setTitle:base::SysUTF16ToNSString( + host_->ui_strings().disconnect_button_text_plus_shortcut)]; } - (void)windowWillClose:(NSNotification*)notification { diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index 2d5dd5b..2541a52 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -727,7 +727,7 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) { LocalizeString(localize_func, #if defined(OS_WIN) /*i18n-content*/"DISCONNECT_BUTTON_PLUS_SHORTCUT_WINDOWS", -#elif defined(OS_MAC) +#elif defined(OS_MACOSX) /*i18n-content*/"DISCONNECT_BUTTON_PLUS_SHORTCUT_MAC_OS_X", #else /*i18n-content*/"DISCONNECT_BUTTON_PLUS_SHORTCUT_LINUX", diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 90d7ed6..63f4f557 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -445,7 +445,6 @@ 'host/chromoting_host_context.h', 'host/client_session.cc', 'host/client_session.h', - 'host/continue_window.cc', 'host/continue_window.h', 'host/continue_window_mac.mm', 'host/continue_window_linux.cc', @@ -458,7 +457,6 @@ 'host/desktop_environment.h', 'host/differ.h', 'host/differ.cc', - 'host/disconnect_window.cc', 'host/disconnect_window.h', 'host/disconnect_window_linux.cc', 'host/disconnect_window_mac.h', @@ -585,7 +583,6 @@ 'host/capturer_fake_ascii.cc', 'host/capturer_fake_ascii.h', 'host/continue_window.h', - 'host/continue_window.cc', 'host/continue_window_mac.mm', 'host/continue_window_linux.cc', 'host/continue_window_win.cc', |