Prefix string16 with base:: in ui/.

ui/base/ime/input_method_ibus.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/base/ime/input_method_ibus.h"
 
 #include <algorithm>
 #include <cstring>
 #include <set>
 #include <vector>
@@ skipping 164 matching lines @@
   }
 
   chromeos::IBusPanelCandidateWindowHandlerInterface* candidate_window =
       chromeos::IBusBridge::Get()->GetCandidateWindowHandler();
   if (!candidate_window)
     return;
   candidate_window->SetCursorBounds(rect, composition_head);
 
   gfx::Range text_range;
   gfx::Range selection_range;
-  string16 surrounding_text;
+  base::string16 surrounding_text;
   if (!GetTextInputClient()->GetTextRange(&text_range) ||
       !GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text) ||
       !GetTextInputClient()->GetSelectionRange(&selection_range)) {
     previous_surrounding_text_.clear();
     previous_selection_range_ = gfx::Range::InvalidRange();
     return;
   }
 
   if (previous_selection_range_ == selection_range &&
       previous_surrounding_text_ == surrounding_text)
@@ skipping 232 matching lines @@
     client->InsertChar(ch, event_flags);
 }
 
 void InputMethodIBus::ProcessInputMethodResult(const ui::KeyEvent& event,
                                                bool handled) {
   TextInputClient* client = GetTextInputClient();
   DCHECK(client);
 
   if (result_text_.length()) {
     if (handled && NeedInsertChar()) {
-      for (string16::const_iterator i = result_text_.begin();
+      for (base::string16::const_iterator i = result_text_.begin();
            i != result_text_.end(); ++i) {
         client->InsertChar(*i, event.flags());
       }
     } else {
       client->InsertText(result_text_);
       composing_text_ = false;
     }
   }
 
   if (composition_changed_ && !IsTextInputTypeNone()) {
@@ skipping 28 matching lines @@
 void InputMethodIBus::CommitText(const std::string& text) {
   if (suppress_next_result_ || text.empty())
     return;
 
   // We need to receive input method result even if the text input type is
   // TEXT_INPUT_TYPE_NONE, to make sure we can always send correct
   // character for each key event to the focused text input client.
   if (!GetTextInputClient())
     return;
 
-  const string16 utf16_text = UTF8ToUTF16(text);
+  const base::string16 utf16_text = UTF8ToUTF16(text);
   if (utf16_text.empty())
     return;
 
   // Append the text to the buffer, because commit signal might be fired
   // multiple times when processing a key event.
   result_text_.append(utf16_text);
 
   // If we are not handling key event, do not bother sending text result if the
   // focused text input client does not support text input.
   if (pending_key_events_.empty() && !IsTextInputTypeNone()) {
@@ skipping 158 matching lines @@
   }
 
   // Use a black thin underline by default.
   if (out_composition->underlines.empty()) {
     out_composition->underlines.push_back(CompositionUnderline(
         0, length, SK_ColorBLACK, false /* thick */));
   }
 }
 
 }  // namespace ui