Prefix string16 with base:: in ui/.

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 43 matching lines @@
   SetKeyState(keyboard_state, !!(flags & ui::EF_LEFT_MOUSE_BUTTON), VK_LBUTTON);
   SetKeyState(keyboard_state, !!(flags & ui::EF_RIGHT_MOUSE_BUTTON),
               VK_RBUTTON);
   SetKeyState(keyboard_state, !!(flags & ui::EF_MIDDLE_MOUSE_BUTTON),
               VK_MBUTTON);
 
   ::SetKeyboardState(keyboard_state);
 }
 
 void FillCompositionText(
-    const string16& text,
+    const base::string16& text,
     int32 selection_start,
     int32 selection_end,
     const std::vector<metro_viewer::UnderlineInfo>& underlines,
     ui::CompositionText* composition_text) {
   composition_text->Clear();
   composition_text->text = text;
   composition_text->selection.set_start(selection_start);
   composition_text->selection.set_end(selection_end);
   composition_text->underlines.resize(underlines.size());
   for (size_t i = 0; i < underlines.size(); ++i) {
@@ skipping 570 matching lines @@
 
 void RemoteRootWindowHostWin::OnImeCandidatePopupChanged(bool visible) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   remote_input_method_private->OnCandidatePopupChanged(visible);
 }
 
 void RemoteRootWindowHostWin::OnImeCompositionChanged(
-    const string16& text,
+    const base::string16& text,
     int32 selection_start,
     int32 selection_end,
     const std::vector<metro_viewer::UnderlineInfo>& underlines) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   ui::CompositionText composition_text;
   FillCompositionText(
       text, selection_start, selection_end, underlines, &composition_text);
   remote_input_method_private->OnCompositionChanged(composition_text);
 }
 
-void RemoteRootWindowHostWin::OnImeTextCommitted(const string16& text) {
+void RemoteRootWindowHostWin::OnImeTextCommitted(const base::string16& text) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   remote_input_method_private->OnTextCommitted(text);
 }
 
 void RemoteRootWindowHostWin::OnImeInputSourceChanged(uint16 language_id,
                                                       bool is_ime) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
@@ skipping 33 matching lines @@
 }
 
 void RemoteRootWindowHostWin::SetEventFlags(uint32 flags) {
   if (flags == event_flags_)
     return;
   event_flags_ = flags;
   SetVirtualKeyStates(event_flags_);
 }
 
 }  // namespace aura