ui/aura: Use base::string16 now that string16 was moved into base namespace.

ui/aura/remote_root_window_host_win.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 "ui/aura/remote_root_window_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
@@ skipping 35 matching lines @@
   SetKeyState(keyboard_state, !!(flags & ui::EF_SHIFT_DOWN), VK_SHIFT);
   SetKeyState(keyboard_state, !!(flags & ui::EF_CONTROL_DOWN), VK_CONTROL);
   SetKeyState(keyboard_state, !!(flags & ui::EF_ALT_DOWN), VK_MENU);
   SetKeyState(keyboard_state, !!(flags & ui::EF_CAPS_LOCK_DOWN), VK_CAPITAL);
 
   ::SetKeyboardState(keyboard_state);
 }
 
 }  // namespace
 
-void HandleOpenFile(
-    const string16& title,
-    const base::FilePath& default_path,
-    const string16& filter,
-    const OpenFileCompletion& callback) {
+void HandleOpenFile(const base::string16& title,
+                    const base::FilePath& default_path,
+                    const base::string16& filter,
+                    const OpenFileCompletion& callback) {
   DCHECK(aura::RemoteRootWindowHostWin::Instance());
   aura::RemoteRootWindowHostWin::Instance()->HandleOpenFile(title,
                                                             default_path,
                                                             filter,
                                                             callback);
 }
 
-void HandleOpenMultipleFiles(
-    const string16& title,
-    const base::FilePath& default_path,
-    const string16& filter,
-    const OpenMultipleFilesCompletion& callback) {
+void HandleOpenMultipleFiles(const base::string16& title,
+                             const base::FilePath& default_path,
+                             const base::string16& filter,
+                             const OpenMultipleFilesCompletion& callback) {
   DCHECK(aura::RemoteRootWindowHostWin::Instance());
   aura::RemoteRootWindowHostWin::Instance()->HandleOpenMultipleFiles(
       title,
       default_path,
       filter,
       callback);
 }
 
-void HandleSaveFile(
-    const string16& title,
-    const base::FilePath& default_path,
-    const string16& filter,
-    int filter_index,
-    const string16& default_extension,
-    const SaveFileCompletion& callback) {
+void HandleSaveFile(const base::string16& title,
+                    const base::FilePath& default_path,
+                    const base::string16& filter,
+                    int filter_index,
+                    const base::string16& default_extension,
+                    const SaveFileCompletion& callback) {
   DCHECK(aura::RemoteRootWindowHostWin::Instance());
   aura::RemoteRootWindowHostWin::Instance()->HandleSaveFile(title,
                                                             default_path,
                                                             filter,
                                                             filter_index,
                                                             default_extension,
                                                             callback);
 }
 
-void HandleSelectFolder(const string16& title,
+void HandleSelectFolder(const base::string16& title,
                         const SelectFolderCompletion& callback) {
   DCHECK(aura::RemoteRootWindowHostWin::Instance());
   aura::RemoteRootWindowHostWin::Instance()->HandleSelectFolder(title,
                                                                 callback);
 }
 
 RemoteRootWindowHostWin* g_instance = NULL;
 
 RemoteRootWindowHostWin* RemoteRootWindowHostWin::Instance() {
   return g_instance;
@@ skipping 52 matching lines @@
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_WindowActivated,
                         OnWindowActivated)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_SetCursorPosAck,
                         OnSetCursorPosAck)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RemoteRootWindowHostWin::HandleOpenFile(
-    const string16& title,
+    const base::string16& title,
     const base::FilePath& default_path,
-    const string16& filter,
+    const base::string16& filter,
     const OpenFileCompletion& callback) {
   if (!host_)
     return;
 
   // Can only have one of these operations in flight.
   DCHECK(file_open_completion_callback_.is_null());
   file_open_completion_callback_ = callback;
 
   host_->Send(new MetroViewerHostMsg_DisplayFileOpen(title,
                                                      filter,
                                                      default_path,
                                                      false));
 }
 
 void RemoteRootWindowHostWin::HandleOpenMultipleFiles(
-      const string16& title,
-      const base::FilePath& default_path,
-      const string16& filter,
-      const OpenMultipleFilesCompletion& callback) {
+    const base::string16& title,
+    const base::FilePath& default_path,
+    const base::string16& filter,
+    const OpenMultipleFilesCompletion& callback) {
   if (!host_)
     return;
 
   // Can only have one of these operations in flight.
   DCHECK(multi_file_open_completion_callback_.is_null());
   multi_file_open_completion_callback_ = callback;
 
   host_->Send(new MetroViewerHostMsg_DisplayFileOpen(title,
                                                      filter,
                                                      default_path,
                                                      true));
 }
 
 void RemoteRootWindowHostWin::HandleSaveFile(
-    const string16& title,
+    const base::string16& title,
     const base::FilePath& default_path,
-    const string16& filter,
+    const base::string16& filter,
     int filter_index,
-    const string16& default_extension,
+    const base::string16& default_extension,
     const SaveFileCompletion& callback) {
   if (!host_)
     return;
 
   MetroViewerHostMsg_SaveAsDialogParams params;
   params.title = title;
   params.default_extension = default_extension;
   params.filter = filter;
   params.filter_index = filter_index;
 
   // Can only have one of these operations in flight.
   DCHECK(file_saveas_completion_callback_.is_null());
   file_saveas_completion_callback_ = callback;
 
   host_->Send(new MetroViewerHostMsg_DisplayFileSaveAs(params));
 }
 
 void RemoteRootWindowHostWin::HandleSelectFolder(
-    const string16& title,
+    const base::string16& title,
     const SelectFolderCompletion& callback) {
   if (!host_)
     return;
 
   // Can only have one of these operations in flight.
   DCHECK(select_folder_completion_callback_.is_null());
   select_folder_completion_callback_ = callback;
 
   host_->Send(new MetroViewerHostMsg_DisplaySelectFolder(title));
 }
@@ skipping 280 matching lines @@
   } else {
     ui::KeyEvent event(type,
                        ui::KeyboardCodeForWindowsKeyCode(vkey),
                        flags,
                        is_character);
     delegate_->OnHostKeyEvent(&event);
   }
 }
 
 }  // namespace aura