Add base:: to string16s in win8/.

win8/metro_driver/chrome_app_view_ash.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.
 
 #include "win8/metro_driver/stdafx.h"
 #include "win8/metro_driver/chrome_app_view_ash.h"
 
 #include <corewindow.h>
 #include <shellapi.h>
 #include <windows.foundation.h>
@@ skipping 177 matching lines @@
 
  private:
   void OnActivateDesktop(const base::FilePath& shortcut, bool ash_exit) {
     ui_proxy_->PostTask(FROM_HERE,
         base::Bind(&ChromeAppViewAsh::OnActivateDesktop,
         base::Unretained(app_view_),
         shortcut, ash_exit));
   }
 
   void OnOpenURLOnDesktop(const base::FilePath& shortcut,
-                          const string16& url) {
+                          const base::string16& url) {
     ui_proxy_->PostTask(FROM_HERE,
         base::Bind(&ChromeAppViewAsh::OnOpenURLOnDesktop,
         base::Unretained(app_view_),
         shortcut, url));
   }
 
   void OnSetCursor(int64 cursor) {
     ui_proxy_->PostTask(FROM_HERE,
                         base::Bind(&ChromeAppViewAsh::OnSetCursor,
                                    base::Unretained(app_view_),
                                    reinterpret_cast<HCURSOR>(cursor)));
   }
 
-  void OnDisplayFileOpenDialog(const string16& title,
-                               const string16& filter,
+  void OnDisplayFileOpenDialog(const base::string16& title,
+                               const base::string16& filter,
                                const base::FilePath& default_path,
                                bool allow_multiple_files) {
     ui_proxy_->PostTask(FROM_HERE,
                         base::Bind(&ChromeAppViewAsh::OnDisplayFileOpenDialog,
                                    base::Unretained(app_view_),
                                    title,
                                    filter,
                                    default_path,
                                    allow_multiple_files));
   }
 
   void OnDisplayFileSaveAsDialog(
     const MetroViewerHostMsg_SaveAsDialogParams& params) {
     ui_proxy_->PostTask(
         FROM_HERE,
         base::Bind(&ChromeAppViewAsh::OnDisplayFileSaveAsDialog,
                    base::Unretained(app_view_),
                    params));
   }
 
-  void OnDisplayFolderPicker(const string16& title) {
+  void OnDisplayFolderPicker(const base::string16& title) {
     ui_proxy_->PostTask(
         FROM_HERE,
         base::Bind(&ChromeAppViewAsh::OnDisplayFolderPicker,
                    base::Unretained(app_view_),
                    title));
   }
 
   void OnSetCursorPos(int x, int y) {
     VLOG(1) << "In IPC OnSetCursorPos: " << x << ", " << y;
     ui_proxy_->PostTask(
@@ skipping 75 matching lines @@
     DVLOG(1) << __FUNCTION__ << ", activation_kind=" << activation_kind;
 
     if (activation_kind == winapp::Activation::ActivationKind_Launch) {
       mswr::ComPtr<winapp::Activation::ILaunchActivatedEventArgs> launch_args;
       if (args->QueryInterface(
               winapp::Activation::IID_ILaunchActivatedEventArgs,
               &launch_args) == S_OK) {
         DVLOG(1) << "Activate: ActivationKind_Launch";
         mswrw::HString launch_args_str;
         launch_args->get_Arguments(launch_args_str.GetAddressOf());
-        string16 actual_launch_args(MakeStdWString(launch_args_str.Get()));
+        base::string16 actual_launch_args(
+            MakeStdWString(launch_args_str.Get()));
         if (actual_launch_args == win8::kMetroViewerConnectVerb) {
           DVLOG(1) << __FUNCTION__ << "Not launching chrome server";
           return true;
         }
       }
     }
   }
 
   DVLOG(1) << "Launching chrome server";
   base::FilePath chrome_exe_path;
 
   if (!PathService::Get(base::FILE_EXE, &chrome_exe_path))
     return false;
 
-  string16 parameters = L"--silent-launch --viewer-connect ";
+  base::string16 parameters = L"--silent-launch --viewer-connect ";
   if (additional_parameters)
     parameters += additional_parameters;
 
   SHELLEXECUTEINFO sei = { sizeof(sei) };
   sei.nShow = SW_SHOWNORMAL;
   sei.lpFile = chrome_exe_path.value().c_str();
   sei.lpDirectory = L"";
   sei.lpParameters = parameters.c_str();
   ::ShellExecuteEx(&sei);
   return true;
@@ skipping 395 matching lines @@
   if (!ash_exit) {
     ::TerminateProcess(sei.hProcess, 0);
     ::CloseHandle(sei.hProcess);
   }
 
   if (ash_exit)
     ui_channel_->Close();
 }
 
 void ChromeAppViewAsh::OnOpenURLOnDesktop(const base::FilePath& shortcut,
-    const string16& url) {
+                                          const base::string16& url) {
   base::FilePath::StringType file = shortcut.value();
   SHELLEXECUTEINFO sei = { sizeof(sei) };
   sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
   sei.nShow = SW_SHOWNORMAL;
   sei.lpFile = file.c_str();
   sei.lpDirectory = L"";
   sei.lpParameters = url.c_str();
   BOOL result = ShellExecuteEx(&sei);
 }
 
 void ChromeAppViewAsh::OnSetCursor(HCURSOR cursor) {
   ::SetCursor(HCURSOR(cursor));
 }
 
 void ChromeAppViewAsh::OnDisplayFileOpenDialog(
-    const string16& title,
-    const string16& filter,
+    const base::string16& title,
+    const base::string16& filter,
     const base::FilePath& default_path,
     bool allow_multiple_files) {
   DVLOG(1) << __FUNCTION__;
 
   // The OpenFilePickerSession instance is deleted when we receive a
   // callback from the OpenFilePickerSession class about the completion of the
   // operation.
   FilePickerSessionBase* file_picker_ =
       new OpenFilePickerSession(this,
                                 title,
                                 filter,
                                 default_path,
                                 allow_multiple_files);
   file_picker_->Run();
 }
 
 void ChromeAppViewAsh::OnDisplayFileSaveAsDialog(
     const MetroViewerHostMsg_SaveAsDialogParams& params) {
   DVLOG(1) << __FUNCTION__;
 
   // The SaveFilePickerSession instance is deleted when we receive a
   // callback from the SaveFilePickerSession class about the completion of the
   // operation.
   FilePickerSessionBase* file_picker_ =
       new SaveFilePickerSession(this, params);
   file_picker_->Run();
 }
 
-void ChromeAppViewAsh::OnDisplayFolderPicker(const string16& title) {
+void ChromeAppViewAsh::OnDisplayFolderPicker(const base::string16& title) {
   DVLOG(1) << __FUNCTION__;
   // The FolderPickerSession instance is deleted when we receive a
   // callback from the FolderPickerSession class about the completion of the
   // operation.
   FilePickerSessionBase* file_picker_ = new FolderPickerSession(this, title);
   file_picker_->Run();
 }
 
 void ChromeAppViewAsh::OnSetCursorPos(int x, int y) {
   if (ui_channel_) {
@@ skipping 94 matching lines @@
   bool is_ime = false;
   if (!input_source_->GetActiveSource(&langid, &is_ime)) {
     LOG(ERROR) << "GetActiveSource failed";
     return;
   }
   ui_channel_->Send(new MetroViewerHostMsg_ImeInputSourceChanged(langid,
                                                                  is_ime));
 }
 
 void ChromeAppViewAsh::OnCompositionChanged(
-    const string16& text,
+    const base::string16& text,
     int32 selection_start,
     int32 selection_end,
     const std::vector<metro_viewer::UnderlineInfo>& underlines) {
   ui_channel_->Send(new MetroViewerHostMsg_ImeCompositionChanged(
       text, selection_start, selection_end, underlines));
 }
 
-void ChromeAppViewAsh::OnTextCommitted(const string16& text) {
+void ChromeAppViewAsh::OnTextCommitted(const base::string16& text) {
   ui_channel_->Send(new MetroViewerHostMsg_ImeTextCommitted(text));
 }
 
 void ChromeAppViewAsh::SendMouseButton(int x,
                                        int y,
                                        int extra,
                                        ui::EventType event_type,
                                        uint32 flags,
                                        ui::EventFlags changed_button) {
   MetroViewerHostMsg_MouseButtonParams params;
@@ skipping 282 matching lines @@
   CheckHR(args->QueryInterface(
           winapp::Activation::IID_ISearchActivatedEventArgs, &search_args));
 
   if (!ui_channel_) {
     DVLOG(1) << "Launched to handle search request";
     LaunchChromeBrowserProcess(L"--windows8-search", args);
   }
 
   mswrw::HString search_string;
   CheckHR(search_args->get_QueryText(search_string.GetAddressOf()));
-  string16 search_text(MakeStdWString(search_string.Get()));
+  base::string16 search_text(MakeStdWString(search_string.Get()));
 
   ui_loop_.PostTask(FROM_HERE,
                     base::Bind(&ChromeAppViewAsh::OnSearchRequest,
                     base::Unretained(this),
                     search_text));
   return S_OK;
 }
 
 HRESULT ChromeAppViewAsh::HandleProtocolRequest(
     winapp::Activation::IActivatedEventArgs* args) {
   DVLOG(1) << __FUNCTION__;
   if (!ui_channel_)
     DVLOG(1) << "Launched to handle url request";
 
   mswr::ComPtr<winapp::Activation::IProtocolActivatedEventArgs>
       protocol_args;
   CheckHR(args->QueryInterface(
           winapp::Activation::IID_IProtocolActivatedEventArgs,
           &protocol_args));
 
   mswr::ComPtr<winfoundtn::IUriRuntimeClass> uri;
   protocol_args->get_Uri(&uri);
   mswrw::HString url;
   uri->get_AbsoluteUri(url.GetAddressOf());
-  string16 actual_url(MakeStdWString(url.Get()));
+  base::string16 actual_url(MakeStdWString(url.Get()));
   DVLOG(1) << "Received url request: " << actual_url;
 
   ui_loop_.PostTask(FROM_HERE,
                     base::Bind(&ChromeAppViewAsh::OnNavigateToUrl,
                                base::Unretained(this),
                                actual_url));
   return S_OK;
 }
 
 HRESULT ChromeAppViewAsh::OnEdgeGestureCompleted(
     winui::Input::IEdgeGesture* gesture,
     winui::Input::IEdgeGestureEventArgs* args) {
   // Swipe from edge gesture (and win+z) is equivalent to pressing F11.
   // TODO(cpu): Make this cleaner for m33.
   ui_channel_->Send(new MetroViewerHostMsg_KeyDown(VK_F11, 1, 0, 0));
   ::Sleep(15);
   ui_channel_->Send(new MetroViewerHostMsg_KeyUp(VK_F11, 1, 0, 0));
   return S_OK;
 }
 
-void ChromeAppViewAsh::OnSearchRequest(const string16& search_string) {
+void ChromeAppViewAsh::OnSearchRequest(const base::string16& search_string) {
   DCHECK(ui_channel_);
   ui_channel_->Send(new MetroViewerHostMsg_SearchRequest(search_string));
 }
 
-void ChromeAppViewAsh::OnNavigateToUrl(const string16& url) {
+void ChromeAppViewAsh::OnNavigateToUrl(const base::string16& url) {
   DCHECK(ui_channel_);
  ui_channel_->Send(new MetroViewerHostMsg_OpenURL(url));
 }
 
 HRESULT ChromeAppViewAsh::OnSizeChanged(winui::Core::ICoreWindow* sender,
     winui::Core::IWindowSizeChangedEventArgs* args) {
   if (!window_) {
     return S_OK;
   }
 
@@ skipping 20 matching lines @@
   mswr::ComPtr<winapp::Core::ICoreApplicationExit> app_exit;
   CheckHR(core_app.As(&app_exit));
   globals.app_exit = app_exit.Detach();
 }
 
 IFACEMETHODIMP
 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) {
   *view = mswr::Make<ChromeAppViewAsh>().Detach();
   return (*view) ? S_OK :  E_OUTOFMEMORY;
 }