Replace string16 with base::string16 in src/webkit

webkit/plugins/npapi/webplugin_ime_win.h

 // Copyright (c) 2011 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 WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IME_WIN_H_
 #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IME_WIN_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "ui/gfx/rect.h"
 
 namespace webkit {
 namespace npapi {
 
 class PluginInstance;
 
 // A class that emulates an IME for windowless plug-ins. A windowless plug-in
 // does not have a window. Therefore, we cannot attach an IME to a windowless
@@ skipping 21 matching lines @@
 // need to update its IME data so the class can return it to the plug-in through
 // its IMM32 calls. To update the IME data, we call CompositionUpdated() or
 // CompositionCompleted() BEFORE sending an IMM32 Window message to the plugin
 // with a SendEvents() call as listed in the following snippet. (Plug-ins call
 // IMM32 functions when it receives IMM32 window messages. We need to update the
 // IME data of this class before sending IMM32 messages so the plug-ins can get
 // the latest data.)
 //
 //   WebPluginIMEWin ime;
 //   ...
-//   string16 text = "composing";
+//   base::string16 text = "composing";
 //   std::vector<int> clauses;
 //   clauses.push_back(0);
 //   clauses.push_back(text.length());
 //   std::vector<int> target;
 //   ime.CompositionUpdated(text, clauses, target, text.length());
 //   ime.SendEvents(instance());
 //
-//   string16 result = "result";
+//   base::string16 result = "result";
 //   ime.CompositionCompleted(result);
 //   ime.SendEvents(instance());
 //
 // This class also provides GetStatus() so we can retrieve the IME status
 // changed by a plug-in with IMM32 functions. This function is mainly used for
 // retrieving the position of a caret.
 //
 class WebPluginIMEWin {
  public:
   // A simple class that allows a plug-in to access a WebPluginIMEWin instance
@@ skipping 14 matching lines @@
   };
 
   WebPluginIMEWin();
   ~WebPluginIMEWin();
 
   // Sends raw IME events sent from a browser to this IME emulator and updates
   // the list of Windows events to be sent to a plug-in. A raw IME event is
   // mapped to two or more Windows events and it is not so trivial to send these
   // Windows events to a plug-in. This function inserts Windows events in the
   // order expected by a plug-in.
-  void CompositionUpdated(const string16& text,
+  void CompositionUpdated(const base::string16& text,
                           std::vector<int> clauses,
                           std::vector<int> target,
                           int cursor_position);
-  void CompositionCompleted(const string16& text);
+  void CompositionCompleted(const base::string16& text);
 
   // Send all the events added in Update() to a plug-in.
   bool SendEvents(PluginInstance* instance);
 
   // Retrieves the status of this IME emulator.
   bool GetStatus(int* input_type, gfx::Rect* caret_rect);
 
   // Returns the pointers to IMM32-emulation functions implemented by this
   // class. This function is used for over-writing the ones returned from
   // GetProcAddress() calls of Win32 API.
@@ skipping 22 matching lines @@
   static HIMC WINAPI ImmGetContext(HWND window);
   static BOOL WINAPI ImmReleaseContext(HWND window, HIMC context);
   static BOOL WINAPI ImmSetCandidateWindow(HIMC context,
                                            CANDIDATEFORM* candidate);
   static BOOL WINAPI ImmSetOpenStatus(HIMC context, BOOL open);
 
   // a list of NPEvents to be sent to a plug-in.
   std::vector<NPEvent> events_;
 
   // The return value for GCS_COMPSTR.
-  string16 composition_text_;
+  base::string16 composition_text_;
 
   // The return value for GCS_RESULTSTR.
-  string16 result_text_;
+  base::string16 result_text_;
 
   // The return value for GCS_COMPATTR.
   std::string composition_attributes_;
 
   // The return value for GCS_COMPCLAUSE.
   std::vector<uint32> composition_clauses_;
 
   // The return value for GCS_RESULTCLAUSE.
   uint32 result_clauses_[2];
 
@@ skipping 18 matching lines @@
   gfx::Rect caret_rect_;
 
   // The pointer to the WebPluginIMEWin instance used by patch functions.
   static WebPluginIMEWin* instance_;
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IME_WIN_H_