Replace string16 with base::string16.

chrome/browser/chromeos/input_method/input_method_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 
 #include <cstddef>
 #include <map>
 #include <string>
@@ skipping 21 matching lines @@
   // including ones not active. The list is used to initialize member variables
   // in this class.
   InputMethodUtil(InputMethodDelegate* delegate,
                   scoped_ptr<InputMethodDescriptors> supported_input_methods);
   ~InputMethodUtil();
 
   // Converts a string sent from IBus IME engines, which is written in English,
   // into Chrome's string ID, then pulls internationalized resource string from
   // the resource bundle and returns it. These functions are not thread-safe.
   // Non-UI threads are not allowed to call them.
-  string16 TranslateString(const std::string& english_string) const;
+  base::string16 TranslateString(const std::string& english_string) const;
 
   // Converts an input method ID to a language code of the IME. Returns "Eng"
   // when |input_method_id| is unknown.
   // Example: "hangul" => "ko"
   std::string GetLanguageCodeFromInputMethodId(
       const std::string& input_method_id) const;
 
   // Converts an input method ID to a display name of the IME. Returns
   // an empty strng when |input_method_id| is unknown.
   // Examples: "pinyin" => "Pinyin"
   std::string GetInputMethodDisplayNameFromId(
       const std::string& input_method_id) const;
 
-  string16 GetInputMethodShortName(
+  base::string16 GetInputMethodShortName(
       const InputMethodDescriptor& input_method) const;
-  string16 GetInputMethodMediumName(
+  base::string16 GetInputMethodMediumName(
       const InputMethodDescriptor& input_method) const;
-  string16 GetInputMethodLongName(
+  base::string16 GetInputMethodLongName(
       const InputMethodDescriptor& input_method) const;
 
   // Converts an input method ID to an input method descriptor. Returns NULL
   // when |input_method_id| is unknown.
   // Example: "pinyin" => { id: "pinyin", display_name: "Pinyin",
   //                        keyboard_layout: "us", language_code: "zh" }
   const InputMethodDescriptor* GetInputMethodDescriptorFromId(
       const std::string& input_method_id) const;
 
   // Gets input method IDs that belong to |language_code|.
@@ skipping 62 matching lines @@
   // Examples:
   //
   // "xkb:us::eng"       => "us"
   // "xkb:us:dvorak:eng" => "us(dvorak)"
   // "xkb:gb::eng"       => "gb"
   // "pinyin"            => "us" (because Pinyin uses US keyboard layout)
   std::string GetKeyboardLayoutName(const std::string& input_method_id) const;
 
  private:
   bool TranslateStringInternal(const std::string& english_string,
-                               string16 *out_string) const;
+                               base::string16 *out_string) const;
 
   // Map from language code to associated input method IDs, etc.
   typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;
   // Map from input method ID to associated input method descriptor.
   typedef std::map<
     std::string, InputMethodDescriptor> InputMethodIdToDescriptorMap;
   // Map from XKB layout ID to associated input method descriptor.
   typedef std::map<std::string, InputMethodDescriptor> XkbIdToDescriptorMap;
   // Map from component extention IME id to associated input method descriptor.
   typedef std::map<std::string, InputMethodDescriptor> ComponentExtIMEMap;
 
   LanguageCodeToIdsMap language_code_to_ids_;
   std::map<std::string, std::string> id_to_language_code_;
   InputMethodIdToDescriptorMap id_to_descriptor_;
   XkbIdToDescriptorMap xkb_id_to_descriptor_;
   ComponentExtIMEMap component_extension_ime_id_to_descriptor_;
 
   typedef base::hash_map<std::string, int> HashType;
   HashType english_to_resource_id_;
 
   InputMethodDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_