diff options
Diffstat (limited to 'chrome/browser/extensions/api/messaging')
3 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability.cc b/chrome/browser/extensions/api/messaging/incognito_connectability.cc index d9f41c6..09a8f05 100644 --- a/chrome/browser/extensions/api/messaging/incognito_connectability.cc +++ b/chrome/browser/extensions/api/messaging/incognito_connectability.cc @@ -79,7 +79,7 @@ bool IncognitoConnectability::Query(const Extension* extension, result = chrome::ShowMessageBox( web_contents ? web_contents->GetView()->GetTopLevelNativeWindow() : NULL, - string16(), // no title + base::string16(), // no title l10n_util::GetStringFUTF16(template_id, UTF8ToUTF16(origin.spec()), UTF8ToUTF16(extension->name())), diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index b3b09f5..a2e7d18 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -203,7 +203,7 @@ TEST_F(NativeMessagingTest, SingleSendMessageWrite) { base::PlatformFile read_file; #if defined(OS_WIN) - string16 pipe_name = base::StringPrintf( + base::string16 pipe_name = base::StringPrintf( L"\\\\.\\pipe\\chrome.nativeMessaging.out.%llx", base::RandUint64()); base::win::ScopedHandle write_handle( CreateNamedPipeW(pipe_name.c_str(), diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc index 31fbdc8..36a0653 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc @@ -27,16 +27,16 @@ namespace { // Reads path to the native messaging host manifest from the registry. Returns // empty string if the path isn't found. -string16 GetManifestPath(const string16& native_host_name, DWORD flags) { +string16 GetManifestPath(const base::string16& native_host_name, DWORD flags) { base::win::RegKey key; - string16 result; + base::string16 result; if (key.Open(HKEY_LOCAL_MACHINE, kNativeMessagingRegistryKey, KEY_QUERY_VALUE | flags) != ERROR_SUCCESS || key.OpenKey(native_host_name.c_str(), KEY_QUERY_VALUE | flags) != ERROR_SUCCESS || key.ReadValue(NULL, &result) != ERROR_SUCCESS) { - return string16(); + return base::string16(); } return result; @@ -48,10 +48,10 @@ string16 GetManifestPath(const string16& native_host_name, DWORD flags) { base::FilePath NativeProcessLauncher::FindManifest( const std::string& native_host_name, std::string* error_message) { - string16 native_host_name_wide = UTF8ToUTF16(native_host_name); + base::string16 native_host_name_wide = UTF8ToUTF16(native_host_name); // First check 32-bit registry and then try 64-bit. - string16 manifest_path_str = + base::string16 manifest_path_str = GetManifestPath(native_host_name_wide, KEY_WOW64_32KEY); if (manifest_path_str.empty()) manifest_path_str = GetManifestPath(native_host_name_wide, KEY_WOW64_64KEY); @@ -91,9 +91,9 @@ bool NativeProcessLauncher::LaunchNativeProcess( uint64 pipe_name_token; crypto::RandBytes(&pipe_name_token, sizeof(pipe_name_token)); - string16 out_pipe_name = base::StringPrintf( + base::string16 out_pipe_name = base::StringPrintf( L"\\\\.\\pipe\\chrome.nativeMessaging.out.%llx", pipe_name_token); - string16 in_pipe_name = base::StringPrintf( + base::string16 in_pipe_name = base::StringPrintf( L"\\\\.\\pipe\\chrome.nativeMessaging.in.%llx", pipe_name_token); // Create the pipes to read and write from. @@ -127,9 +127,9 @@ bool NativeProcessLauncher::LaunchNativeProcess( scoped_ptr<wchar_t[]> comspec(new wchar_t[comspec_length]); ::GetEnvironmentVariable(L"COMSPEC", comspec.get(), comspec_length); - string16 command_line_string = command_line.GetCommandLineString(); + base::string16 command_line_string = command_line.GetCommandLineString(); - string16 command = base::StringPrintf( + base::string16 command = base::StringPrintf( L"%ls /c %ls < %ls > %ls", comspec.get(), command_line_string.c_str(), in_pipe_name.c_str(), out_pipe_name.c_str()); |