diff options
author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 18:06:14 +0000 |
---|---|---|
committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 18:06:14 +0000 |
commit | c81ebd2be48e6857d0b4c44a8e1291624d46d02a (patch) | |
tree | a32beec55ab1ae9c11dc075d406d34f962707514 /remoting/host/plugin/host_script_object.cc | |
parent | ae7bf791a451e276ecd7c1a2f76ee6ce296df466 (diff) | |
download | chromium_src-c81ebd2be48e6857d0b4c44a8e1291624d46d02a.zip chromium_src-c81ebd2be48e6857d0b4c44a8e1291624d46d02a.tar.gz chromium_src-c81ebd2be48e6857d0b4c44a8e1291624d46d02a.tar.bz2 |
Revert 159572 - Updated 'Connected' message to include audio info.
Since IT2Me doesn't support audio, this is the wrong place to fix this.
BUG=153361
Review URL: https://codereview.chromium.org/11028005
TBR=jamiewalch@google.com
Review URL: https://codereview.chromium.org/11040028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/plugin/host_script_object.cc')
-rw-r--r-- | remoting/host/plugin/host_script_object.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index 2d441f3..e2352a7 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -1125,16 +1125,9 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) { &ui_strings.continue_button_text); LocalizeString(localize_func, /*i18n-content*/"STOP_SHARING_BUTTON", &ui_strings.stop_sharing_button_text); - // The disconnect message depends on whether or not audio is supported. -#if defined(OS_MACOSX) - LocalizeStringWithSubstitution( - localize_func, /*i18n-content*/"MESSAGE_SHARED_NO_AUDIO", "$1", - &ui_strings.disconnect_message); -#else - LocalizeStringWithSubstitution( - localize_func, /*i18n-content*/"MESSAGE_SHARED", "$1", - &ui_strings.disconnect_message); -#endif + LocalizeStringWithSubstitution(localize_func, + /*i18n-content*/"MESSAGE_SHARED", "$1", + &ui_strings.disconnect_message); base::AutoLock auto_lock(ui_strings_lock_); ui_strings_ = ui_strings; |