Prefix string16 with base:: in ui/.

ui/base/ime/chromeos/character_composer.h

 // Copyright 2013 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.
 
 #ifndef UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_
 #define UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_
 
 #include <vector>
 
 #include "base/strings/string_util.h"
@@ skipping 12 matching lines @@
   void Reset();
 
   // Filters keypress.
   // Returns true if the keypress is recognized as a part of composition
   // sequence.
   // Fabricated events which don't have the native event, are not supported.
   bool FilterKeyPress(const ui::KeyEvent& event);
 
   // Returns a string consisting of composed character.
   // Empty string is returned when there is no composition result.
-  const string16& composed_character() const { return composed_character_; }
+  const base::string16& composed_character() const {
+    return composed_character_;
+  }
 
   // Returns the preedit string.
-  const string16& preedit_string() const { return preedit_string_; }
+  const base::string16& preedit_string() const { return preedit_string_; }
 
  private:
   friend class CharacterComposerTest;
 
   // An enum to describe composition mode.
   enum CompositionMode {
     // This is the initial state.
     // Composite a character with dead-keys and compose-key.
     KEY_SEQUENCE_MODE,
     // Composite a character with a hexadecimal unicode sequence.
@@ skipping 31 matching lines @@
   // Commit a character composed from hexadecimal uncode sequence
   void CommitHex();
 
   // Updates preedit string in hexadecimal mode.
   void UpdatePreeditStringHexMode();
 
   // Remembers keypresses previously filtered.
   std::vector<unsigned int> compose_buffer_;
 
   // A string representing the composed character.
-  string16 composed_character_;
+  base::string16 composed_character_;
 
   // Preedit string.
-  string16 preedit_string_;
+  base::string16 preedit_string_;
 
   // Composition mode which this instance is in.
   CompositionMode composition_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(CharacterComposer);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_