diff options
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/host/clipboard_win.cc | 4 | ||||
-rw-r--r-- | remoting/host/disconnect_window_gtk.cc | 3 | ||||
-rw-r--r-- | remoting/host/disconnect_window_mac.h | 2 | ||||
-rw-r--r-- | remoting/host/disconnect_window_win.cc | 10 | ||||
-rw-r--r-- | remoting/host/host_event_logger_win.cc | 2 | ||||
-rw-r--r-- | remoting/host/plugin/host_script_object.cc | 7 | ||||
-rw-r--r-- | remoting/host/plugin/host_script_object.h | 4 | ||||
-rw-r--r-- | remoting/host/setup/daemon_controller_delegate_win.cc | 6 | ||||
-rw-r--r-- | remoting/host/setup/daemon_installer_win.cc | 2 | ||||
-rw-r--r-- | remoting/host/win/elevated_controller.cc | 8 | ||||
-rw-r--r-- | remoting/host/win/launch_process_with_token.cc | 4 | ||||
-rw-r--r-- | remoting/host/win/rdp_client_window.cc | 4 | ||||
-rw-r--r-- | remoting/host/win/security_descriptor.cc | 2 |
13 files changed, 32 insertions, 26 deletions
diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc index 71cff1c..03d6044 100644 --- a/remoting/host/clipboard_win.cc +++ b/remoting/host/clipboard_win.cc @@ -195,7 +195,7 @@ void ClipboardWin::InjectClipboardEvent( return; } - string16 text = UTF8ToUTF16(ReplaceLfByCrLf(event.data())); + base::string16 text = UTF8ToUTF16(ReplaceLfByCrLf(event.data())); ScopedClipboard clipboard; if (!clipboard.Init(window_->hwnd())) { @@ -225,7 +225,7 @@ void ClipboardWin::OnClipboardUpdate() { DCHECK(window_); if (::IsClipboardFormatAvailable(CF_UNICODETEXT)) { - string16 text; + base::string16 text; // Add a scope, so that we keep the clipboard open for as short a time as // possible. { diff --git a/remoting/host/disconnect_window_gtk.cc b/remoting/host/disconnect_window_gtk.cc index 06d417a..5b840e0 100644 --- a/remoting/host/disconnect_window_gtk.cc +++ b/remoting/host/disconnect_window_gtk.cc @@ -160,7 +160,8 @@ void DisconnectWindowGtk::Start( // Extract the user name from the JID. std::string client_jid = client_session_control_->client_jid(); - string16 username = UTF8ToUTF16(client_jid.substr(0, client_jid.find('/'))); + base::string16 username = + UTF8ToUTF16(client_jid.substr(0, client_jid.find('/'))); gtk_label_set_text( GTK_LABEL(message_), l10n_util::GetStringFUTF8(IDR_MESSAGE_SHARED, username).c_str()); diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h index 692a23d..7fd6115 100644 --- a/remoting/host/disconnect_window_mac.h +++ b/remoting/host/disconnect_window_mac.h @@ -15,7 +15,7 @@ @interface DisconnectWindowController : NSWindowController { @private base::Closure disconnect_callback_; - string16 username_; + base::string16 username_; IBOutlet NSTextField* connectedToField_; IBOutlet NSButton* disconnectButton_; } diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc index 2a8174d..59c8c24 100644 --- a/remoting/host/disconnect_window_win.cc +++ b/remoting/host/disconnect_window_win.cc @@ -78,7 +78,7 @@ class DisconnectWindowWin : public HostWindow { }; // Returns the text for the given dialog control window. -bool GetControlText(HWND control, string16* text) { +bool GetControlText(HWND control, base::string16* text) { // GetWindowText truncates the text if it is longer than can fit into // the buffer. WCHAR buffer[256]; @@ -91,7 +91,9 @@ bool GetControlText(HWND control, string16* text) { } // Returns width |text| rendered in |control| window. -bool GetControlTextWidth(HWND control, const string16& text, LONG* width) { +bool GetControlTextWidth(HWND control, + const base::string16& text, + LONG* width) { RECT rect = {0, 0, 0, 0}; base::win::ScopedGetDC dc(control); base::win::ScopedSelectObject font( @@ -306,8 +308,8 @@ bool DisconnectWindowWin::SetStrings() { if (!hwnd_button || !hwnd_message) return false; - string16 button_text; - string16 message_text; + base::string16 button_text; + base::string16 message_text; if (!GetControlText(hwnd_button, &button_text) || !GetControlText(hwnd_message, &message_text)) { return false; diff --git a/remoting/host/host_event_logger_win.cc b/remoting/host/host_event_logger_win.cc index 7b634ec..6fd5b6b 100644 --- a/remoting/host/host_event_logger_win.cc +++ b/remoting/host/host_event_logger_win.cc @@ -120,7 +120,7 @@ void HostEventLoggerWin::Log(WORD type, // ReportEventW() takes an array of raw string pointers. They should stay // valid for the duration of the call. std::vector<const WCHAR*> raw_strings(strings.size()); - std::vector<string16> utf16_strings(strings.size()); + std::vector<base::string16> utf16_strings(strings.size()); for (size_t i = 0; i < strings.size(); ++i) { utf16_strings[i] = UTF8ToUTF16(strings[i]); raw_strings[i] = utf16_strings[i].c_str(); diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index 0d4bb3b..288b240 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -937,14 +937,15 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) { // Reload resources for the current locale. The default UI locale is used on // Windows. #if !defined(OS_WIN) - string16 ui_locale; + base::string16 ui_locale; LocalizeString(localize_func, "@@ui_locale", &ui_locale); remoting::LoadResources(UTF16ToUTF8(ui_locale)); #endif // !defined(OS_WIN) } bool HostNPScriptObject::LocalizeString(NPObject* localize_func, - const char* tag, string16* result) { + const char* tag, + base::string16* result) { return LocalizeStringWithSubstitution(localize_func, tag, NULL, result); } @@ -952,7 +953,7 @@ bool HostNPScriptObject::LocalizeStringWithSubstitution( NPObject* localize_func, const char* tag, const char* substitution, - string16* result) { + base::string16* result) { int argc = substitution ? 2 : 1; scoped_ptr<NPVariant[]> args(new NPVariant[argc]); STRINGZ_TO_NPVARIANT(tag, args[0]); diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h index ee0ac4a..66fd102 100644 --- a/remoting/host/plugin/host_script_object.h +++ b/remoting/host/plugin/host_script_object.h @@ -182,7 +182,7 @@ class HostNPScriptObject : public It2MeHost::Observer { // |result| and returns true on success, or leaves it unchanged and returns // false on failure. bool LocalizeString(NPObject* localize_func, const char* tag, - string16* result); + base::string16* result); // Helper function for executing InvokeDefault on an NPObject that performs // a string->string mapping with one substitution. Stores the translation in @@ -191,7 +191,7 @@ class HostNPScriptObject : public It2MeHost::Observer { bool LocalizeStringWithSubstitution(NPObject* localize_func, const char* tag, const char* substitution, - string16* result); + base::string16* result); ////////////////////////////////////////////////////////// // Helper methods for Me2Me host. diff --git a/remoting/host/setup/daemon_controller_delegate_win.cc b/remoting/host/setup/daemon_controller_delegate_win.cc index 8a974b6..74f5846 100644 --- a/remoting/host/setup/daemon_controller_delegate_win.cc +++ b/remoting/host/setup/daemon_controller_delegate_win.cc @@ -180,7 +180,8 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateWin::GetConfig() { return scoped_ptr<base::DictionaryValue>(); // Parse the string into a dictionary. - string16 file_content(static_cast<BSTR>(host_config), host_config.Length()); + base::string16 file_content( + static_cast<BSTR>(host_config), host_config.Length()); scoped_ptr<base::Value> config( base::JSONReader::Read(UTF16ToUTF8(file_content), base::JSON_ALLOW_TRAILING_COMMAS)); @@ -277,7 +278,8 @@ std::string DaemonControllerDelegateWin::GetVersion() { if (FAILED(hr)) return std::string(); - return UTF16ToUTF8(string16(static_cast<BSTR>(version), version.Length())); + return UTF16ToUTF8( + base::string16(static_cast<BSTR>(version), version.Length())); } DaemonController::UsageStatsConsent diff --git a/remoting/host/setup/daemon_installer_win.cc b/remoting/host/setup/daemon_installer_win.cc index 176efa1..f7b7d35 100644 --- a/remoting/host/setup/daemon_installer_win.cc +++ b/remoting/host/setup/daemon_installer_win.cc @@ -293,7 +293,7 @@ void DaemonCommandLineInstallerWin::Install() { } // Launch the updater process and wait for its termination. - string16 command_line = WideToUTF16( + base::string16 command_line = WideToUTF16( base::StringPrintf(kGoogleUpdateCommandLineFormat, google_update.c_str(), kHostOmahaAppid, diff --git a/remoting/host/win/elevated_controller.cc b/remoting/host/win/elevated_controller.cc index 0bb6d2a..d2eea5e 100644 --- a/remoting/host/win/elevated_controller.cc +++ b/remoting/host/win/elevated_controller.cc @@ -250,7 +250,7 @@ HRESULT WriteConfig(const char* content, size_t length, HWND owner_window) { base::DictionaryValue unprivileged_config_dict; for (int i = 0; i < arraysize(kUnprivilegedConfigKeys); ++i) { const char* key = kUnprivilegedConfigKeys[i]; - string16 value; + base::string16 value; if (config_dict->GetString(key, &value)) { unprivileged_config_dict.SetString(key, value); } @@ -338,7 +338,7 @@ STDMETHODIMP ElevatedController::GetVersion(BSTR* version_out) { scoped_ptr<FileVersionInfo> version_info( FileVersionInfo::CreateFileVersionInfoForModule(binary)); - string16 version; + base::string16 version; if (version_info.get()) { version = version_info->product_version(); } @@ -359,7 +359,7 @@ STDMETHODIMP ElevatedController::SetConfig(BSTR config) { } std::string file_content = UTF16ToUTF8( - string16(static_cast<char16*>(config), ::SysStringLen(config))); + base::string16(static_cast<base::char16*>(config), ::SysStringLen(config))); return WriteConfig(file_content.c_str(), file_content.size(), owner_window_); } @@ -452,7 +452,7 @@ STDMETHODIMP ElevatedController::StopDaemon() { STDMETHODIMP ElevatedController::UpdateConfig(BSTR config) { // Parse the config. std::string config_str = UTF16ToUTF8( - string16(static_cast<char16*>(config), ::SysStringLen(config))); + base::string16(static_cast<base::char16*>(config), ::SysStringLen(config))); scoped_ptr<base::Value> config_value(base::JSONReader::Read(config_str)); if (!config_value.get()) { return E_FAIL; diff --git a/remoting/host/win/launch_process_with_token.cc b/remoting/host/win/launch_process_with_token.cc index f45332c..6cb7e31 100644 --- a/remoting/host/win/launch_process_with_token.cc +++ b/remoting/host/win/launch_process_with_token.cc @@ -54,7 +54,7 @@ void CloseHandlesAndTerminateProcess(PROCESS_INFORMATION* process_information) { // Connects to the executor server corresponding to |session_id|. bool ConnectToExecutionServer(uint32 session_id, base::win::ScopedHandle* pipe_out) { - string16 pipe_name; + base::string16 pipe_name; // Use winsta!WinStationQueryInformationW() to determine the process creation // pipe name for the session. @@ -313,7 +313,7 @@ bool SendCreateProcessRequest( PROCESS_INFORMATION process_information; }; - string16 desktop; + base::string16 desktop; if (desktop_name) desktop = desktop_name; diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc index 2404e13..2a30cd1 100644 --- a/remoting/host/win/rdp_client_window.cc +++ b/remoting/host/win/rdp_client_window.cc @@ -59,7 +59,7 @@ base::LazyInstance<base::ThreadLocalPointer<RdpClientWindow::WindowHook> > // FindWindowEx() this function walks the tree of windows recursively. The walk // is done in breadth-first order. The function returns NULL if the child window // could not be found. -HWND FindWindowRecursively(HWND parent, const string16& class_name) { +HWND FindWindowRecursively(HWND parent, const base::string16& class_name) { std::list<HWND> windows; windows.push_back(parent); @@ -69,7 +69,7 @@ HWND FindWindowRecursively(HWND parent, const string16& class_name) { // See if the window class name matches |class_name|. WCHAR name[kMaxWindowClassLength]; int length = GetClassName(child, name, arraysize(name)); - if (string16(name, length) == class_name) + if (base::string16(name, length) == class_name) return child; // Remember the window to look through its children. diff --git a/remoting/host/win/security_descriptor.cc b/remoting/host/win/security_descriptor.cc index d7ab6b8..d6c7af0 100644 --- a/remoting/host/win/security_descriptor.cc +++ b/remoting/host/win/security_descriptor.cc @@ -32,7 +32,7 @@ std::string ConvertSidToString(SID* sid) { if (!ConvertSidToStringSid(sid, &c_sid_string)) return std::string(); - string16 sid_string(c_sid_string); + base::string16 sid_string(c_sid_string); LocalFree(c_sid_string); return UTF16ToUTF8(sid_string); } |