Convert string16 to base::string16 in content.

content/browser/accessibility/browser_accessibility_win.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 CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
@@ skipping 68 matching lines @@
     COM_INTERFACE_ENTRY(IRawElementProviderSimple)
   END_COM_MAP()
 
   // Represents a non-static text node in IAccessibleHypertext. This character
   // is embedded in the response to IAccessibleText::get_text, indicating the
   // position where a non-static text child object appears.
   CONTENT_EXPORT static const char16 kEmbeddedCharacter[];
 
   // Mappings from roles and states to human readable strings. Initialize
   // with |InitializeStringMaps|.
-  static std::map<int32, string16> role_string_map;
-  static std::map<int32, string16> state_string_map;
+  static std::map<int32, base::string16> role_string_map;
+  static std::map<int32, base::string16> state_string_map;
 
   CONTENT_EXPORT BrowserAccessibilityWin();
 
   CONTENT_EXPORT virtual ~BrowserAccessibilityWin();
 
   // The Windows-specific unique ID, used as the child ID for MSAA methods
   // like NotifyWinEvent, and as the unique ID for IAccessible2 and ISimpleDOM.
   LONG unique_id_win() const { return unique_id_win_; }
 
   //
@@ skipping 657 matching lines @@
 
   CONTENT_EXPORT HRESULT WINAPI InternalQueryInterface(
       void* this_ptr,
       const _ATL_INTMAP_ENTRY* entries,
       REFIID iid,
       void** object);
 
   // Accessors.
   int32 ia_role() const { return ia_role_; }
   int32 ia_state() const { return ia_state_; }
-  const string16& role_name() const { return role_name_; }
+  const base::string16& role_name() const { return role_name_; }
   int32 ia2_role() const { return ia2_role_; }
   int32 ia2_state() const { return ia2_state_; }
-  const std::vector<string16>& ia2_attributes() const {
+  const std::vector<base::string16>& ia2_attributes() const {
     return ia2_attributes_;
   }
 
  private:
   // Add one to the reference count and return the same object. Always
   // use this method when returning a BrowserAccessibilityWin object as
   // an output parameter to a COM interface, never use it otherwise.
   BrowserAccessibilityWin* NewReference();
 
   // Many MSAA methods take a var_id parameter indicating that the operation
@@ skipping 24 matching lines @@
   void BoolAttributeToIA2(AccessibilityNodeData::BoolAttribute attribute,
                           const char* ia2_attr);
 
   // If the int attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void IntAttributeToIA2(AccessibilityNodeData::IntAttribute attribute,
                          const char* ia2_attr);
 
   // Get the value text, which might come from the floating-point
   // value for some roles.
-  string16 GetValueText();
+  base::string16 GetValueText();
 
   // Get the text of this node for the purposes of IAccessibleText - it may
   // be the name, it may be the value, etc. depending on the role.
-  string16 TextForIAccessibleText();
+  base::string16 TextForIAccessibleText();
 
   // If offset is a member of IA2TextSpecialOffsets this function updates the
   // value of offset and returns, otherwise offset remains unchanged.
-  void HandleSpecialTextOffset(const string16& text, LONG* offset);
+  void HandleSpecialTextOffset(const base::string16& text, LONG* offset);
 
   // Convert from a IA2TextBoundaryType to a ui::TextBoundaryType.
   ui::TextBoundaryType IA2TextBoundaryToTextBoundary(IA2TextBoundaryType type);
 
   // Search forwards (direction == 1) or backwards (direction == -1)
   // from the given offset until the given boundary is found, and
   // return the offset of that boundary.
-  LONG FindBoundary(const string16& text,
+  LONG FindBoundary(const base::string16& text,
                     IA2TextBoundaryType ia2_boundary,
                     LONG start_offset,
                     ui::TextBoundaryDirection direction);
 
   // Return a pointer to the object corresponding to the given renderer_id,
   // does not make a new reference.
   BrowserAccessibilityWin* GetFromRendererID(int32 renderer_id);
 
   // Windows-specific unique ID (unique within the browser process),
   // used for get_accChild, NotifyWinEvent, and as the unique ID for
   // IAccessible2 and ISimpleDOM.
   LONG unique_id_win_;
 
   // IAccessible role and state.
   int32 ia_role_;
   int32 ia_state_;
-  string16 role_name_;
+  base::string16 role_name_;
 
   // IAccessible2 role and state.
   int32 ia2_role_;
   int32 ia2_state_;
 
   // IAccessible2 attributes.
-  std::vector<string16> ia2_attributes_;
+  std::vector<base::string16> ia2_attributes_;
 
   // True in Initialize when the object is first created, and false
   // subsequent times.
   bool first_time_;
 
   // The previous text, before the last update to this object.
-  string16 previous_text_;
+  base::string16 previous_text_;
 
   // The old text to return in IAccessibleText::get_oldText - this is like
   // previous_text_ except that it's NOT updated when the object
   // is initialized again but the text doesn't change.
-  string16 old_text_;
+  base::string16 old_text_;
 
   // The previous state, used to see if there was a state change.
   int32 old_ia_state_;
 
   // Relationships between this node and other nodes.
   std::vector<BrowserAccessibilityRelation*> relations_;
 
   // The text of this node including embedded hyperlink characters.
-  string16 hypertext_;
+  base::string16 hypertext_;
 
   // Maps the |hypertext_| embedded character offset to an index in
   // |hyperlinks_|.
   std::map<int32, int32> hyperlink_offset_to_index_;
 
   // Collection of non-static text child indicies, each of which corresponds to
   // a hyperlink.
   std::vector<int32> hyperlinks_;
 
   // The next unique id to use.
   static LONG next_unique_id_win_;
 
   // Give BrowserAccessibility::Create access to our constructor.
   friend class BrowserAccessibility;
   friend class BrowserAccessibilityRelation;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_