Add base:: to string16s in win8/.

win8/delegate_execute/command_execute_impl.cc

 // Copyright (c) 2012 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.
 // Implementation of the CommandExecuteImpl class which implements the
 // IExecuteCommand and related interfaces for handling ShellExecute based
 // launches of the Chrome browser.
 
 #include "win8/delegate_execute/command_execute_impl.h"
 
 #include <shlguid.h>
@@ skipping 18 matching lines @@
 #include "chrome/installer/util/util_constants.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "win8/delegate_execute/chrome_util.h"
 #include "win8/delegate_execute/delegate_execute_util.h"
 #include "win8/viewer/metro_viewer_constants.h"
 
 namespace {
 
 // Helper function to retrieve the url from IShellItem interface passed in.
 // Returns S_OK on success.
-HRESULT GetUrlFromShellItem(IShellItem* shell_item, string16* url) {
+HRESULT GetUrlFromShellItem(IShellItem* shell_item, base::string16* url) {
   DCHECK(shell_item);
   DCHECK(url);
   // First attempt to get the url from the underlying IDataObject if any. This
   // ensures that we get the full url, i.e. including the anchor.
   // If we fail to get the underlying IDataObject we retrieve the url via the
   // IShellItem::GetDisplayName function.
   CComPtr<IDataObject> object;
   HRESULT hr = shell_item->BindToHandler(NULL,
                                          BHID_DataObject,
                                          IID_IDataObject,
@@ skipping 272 matching lines @@
   CComPtr<IApplicationActivationManager> activation_manager;
   hr = activation_manager.CoCreateInstance(CLSID_ApplicationActivationManager);
   if (!activation_manager) {
     AtlTrace("Failed to get the activation manager, error 0x%x\n", hr);
     return S_OK;
   }
 
   BrowserDistribution* distribution = BrowserDistribution::GetDistribution();
   bool is_per_user_install = InstallUtil::IsPerUserInstall(
       chrome_exe_.value().c_str());
-  string16 app_id = ShellUtil::GetBrowserModelId(
+  base::string16 app_id = ShellUtil::GetBrowserModelId(
       distribution, is_per_user_install);
 
   DWORD pid = 0;
   if (launch_scheme_ == INTERNET_SCHEME_FILE &&
-      display_name_.find(installer::kChromeExe) != string16::npos) {
+      display_name_.find(installer::kChromeExe) != base::string16::npos) {
     AtlTrace("Activating for file\n");
     hr = activation_manager->ActivateApplication(app_id.c_str(),
                                                  verb_.c_str(),
                                                  AO_NONE,
                                                  &pid);
   } else {
     AtlTrace("Activating for protocol\n");
     hr = activation_manager->ActivateForProtocol(app_id.c_str(),
                                                  item_array_,
                                                  &pid);
@@ skipping 60 matching lines @@
       AtlTrace("Failed to find chrome exe file\n");
       return false;
     }
   }
 
   AtlTrace("Got chrome exe path as %ls\n", chrome_exe->value().c_str());
   return true;
 }
 
 bool CommandExecuteImpl::GetLaunchScheme(
-    string16* display_name, INTERNET_SCHEME* scheme) {
+    base::string16* display_name, INTERNET_SCHEME* scheme) {
   if (!item_array_)
     return false;
 
   ATLASSERT(display_name);
   ATLASSERT(scheme);
 
   DWORD count = 0;
   item_array_->GetCount(&count);
 
   if (count != 1) {
@@ skipping 29 matching lines @@
     return false;
   }
 
   AtlTrace("Launch scheme is [%ls] (%d)\n", scheme_name, components.nScheme);
   *scheme = components.nScheme;
   return true;
 }
 
 HRESULT CommandExecuteImpl::LaunchDesktopChrome() {
   AtlTrace("In %hs\n", __FUNCTION__);
-  string16 display_name = display_name_;
+  base::string16 display_name = display_name_;
 
   switch (launch_scheme_) {
     case INTERNET_SCHEME_FILE:
       // If anything other than chrome.exe is passed in the display name we
       // should honor it. For e.g. If the user clicks on a html file when
       // chrome is the default we should treat it as a parameter to be passed
       // to chrome.
-      if (display_name.find(installer::kChromeExe) != string16::npos)
+      if (display_name.find(installer::kChromeExe) != base::string16::npos)
         display_name.clear();
       break;
 
     default:
       break;
   }
 
   CommandLine chrome(
       delegate_execute::MakeChromeCommandLine(chrome_exe_, parameters_,
                                               display_name));
-  string16 command_line(chrome.GetCommandLineString());
+  base::string16 command_line(chrome.GetCommandLineString());
 
   AtlTrace("Formatted command line is %ls\n", command_line.c_str());
 
   PROCESS_INFORMATION temp_process_info = {};
   BOOL ret = CreateProcess(chrome_exe_.value().c_str(),
                            const_cast<LPWSTR>(command_line.c_str()),
                            NULL, NULL, FALSE, 0, NULL, NULL, &start_info_,
                            &temp_process_info);
   if (ret) {
     base::win::ScopedProcessInformation proc_info(temp_process_info);
@@ skipping 64 matching lines @@
     AtlTrace("Invalid registry launch mode value %u\n", reg_value);
     launch_mode = ECHUIM_DESKTOP;
   } else {
     launch_mode = static_cast<EC_HOST_UI_MODE>(reg_value);
     AtlTrace("Launch mode forced by registry to %s\n", modes[launch_mode]);
   }
 
   launch_mode_determined = true;
   return launch_mode;
 }