Prefix string16 with base:: in ui/.

ui/views/controls/table/table_view.h

Index: ui/views/controls/table/table_view.h
diff --git a/ui/views/controls/table/table_view.h b/ui/views/controls/table/table_view.h
index c2a94724a52b8e25b21b0921915476627597c67f..64cb2a433c95969074d7d0a51aaf6c9bac635608 100644
--- a/ui/views/controls/table/table_view.h
+++ b/ui/views/controls/table/table_view.h
@@ -171,7 +171,7 @@ class VIEWS_EXPORT TableView
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual bool GetTooltipText(const gfx::Point& p,
-                              string16* tooltip) const OVERRIDE;
+                              base::string16* tooltip) const OVERRIDE;
   virtual bool GetTooltipTextOrigin(const gfx::Point& p,
                                     gfx::Point* loc) const OVERRIDE;
 
@@ -291,7 +291,7 @@ class VIEWS_EXPORT TableView
   // sets |tooltip| and/or |tooltip_origin| as appropriate, each of which may be
   // NULL.
   bool GetTooltipImpl(const gfx::Point& location,
-                      string16* tooltip,
+                      base::string16* tooltip,
                       gfx::Point* tooltip_origin) const;
 
   ui::TableModel* model_;