ui/oak: Convert it from string16 to base::string16.

TBR=ben@chromium.org,brettw@chromium.org

Review URL: https://chromiumcodereview.appspot.com/14222012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194084 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 21 insertions, 20 deletions

diff --git a/ui/oak/oak_aura_window_display.cc b/ui/oak/oak_aura_window_display.cc
index 70ad155..228e1d4 100644
--- a/ui/oak/oak_aura_window_display.cc
+++ b/ui/oak/oak_aura_window_display.cc
@@ -40,7 +40,7 @@ ROW_COUNT
 };
 
 // aura::Window-specific pretty printing.
-string16 PropertyWithWindowType(int type) {
+base::string16 PropertyWithWindowType(int type) {
   std::string property = "Type: ";
   switch (type) {
     case aura::client::WINDOW_TYPE_UNKNOWN:
@@ -97,11 +97,11 @@ int OakAuraWindowDisplay::RowCount() {
   return ROW_COUNT;
 }
 
-string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
+base::string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
   if (!window_)
     return EmptyString16();
 
-  string16 text;
+  base::string16 text;
   switch (row) {
     case ROW_ID:
       return PropertyWithInteger("Id: ", window_->id());
diff --git a/ui/oak/oak_aura_window_display.h b/ui/oak/oak_aura_window_display.h
index 4048578..cc78c86 100644
--- a/ui/oak/oak_aura_window_display.h
+++ b/ui/oak/oak_aura_window_display.h
@@ -22,7 +22,7 @@ class OakAuraWindowDisplay : public OakDetailsModel {
 
   // Overridden from ui::TableModel:
   virtual int RowCount() OVERRIDE;
-  virtual string16 GetText(int row, int column_id) OVERRIDE;
+  virtual base::string16 GetText(int row, int column_id) OVERRIDE;
   virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
 
   ui::TableModelObserver* observer_;
diff --git a/ui/oak/oak_pretty_print.cc b/ui/oak/oak_pretty_print.cc
index 3b5cdb0..f549dcc 100644
--- a/ui/oak/oak_pretty_print.cc
+++ b/ui/oak/oak_pretty_print.cc
@@ -14,28 +14,28 @@
 namespace oak {
 namespace internal {
 
-string16 PropertyWithInteger(const std::string& prefix, int value) {
+base::string16 PropertyWithInteger(const std::string& prefix, int value) {
   return ASCIIToUTF16(prefix) + base::IntToString16(value);
 }
 
-string16 PropertyWithVoidStar(const std::string& prefix, void* ptr) {
+base::string16 PropertyWithVoidStar(const std::string& prefix, void* ptr) {
   unsigned int cast_ptr =
       static_cast<unsigned int>(reinterpret_cast<intptr_t>(ptr));
   return ASCIIToUTF16(
       prefix + "0x" + (ptr ? base::StringPrintf("%x", cast_ptr) : "0"));
 }
 
-string16 PropertyWithBool(const std::string& prefix, bool value) {
+base::string16 PropertyWithBool(const std::string& prefix, bool value) {
   return ASCIIToUTF16(prefix + (value ? "true" : "false"));
 }
 
-string16 PropertyWithBounds(const std::string& prefix,
-                            const gfx::Rect& bounds) {
+base::string16 PropertyWithBounds(const std::string& prefix,
+                                  const gfx::Rect& bounds) {
   return ASCIIToUTF16(prefix + bounds.ToString());
 }
 
-string16 PropertyWithInsets(const std::string& prefix,
-                            const gfx::Insets& insets) {
+base::string16 PropertyWithInsets(const std::string& prefix,
+                                  const gfx::Insets& insets) {
   return ASCIIToUTF16(prefix + insets.ToString());
 }
 
diff --git a/ui/oak/oak_pretty_print.h b/ui/oak/oak_pretty_print.h
index 89dcfa4..6f4c5a8 100644
--- a/ui/oak/oak_pretty_print.h
+++ b/ui/oak/oak_pretty_print.h
@@ -17,12 +17,13 @@ namespace internal {
 
 // Functions that return a string consisting of a prefix and the supplied value
 // converted to a pretty string representation.
-string16 PropertyWithInteger(const std::string& prefix, int value);
-string16 PropertyWithVoidStar(const std::string& prefix, void* ptr);
-string16 PropertyWithBool(const std::string& prefix, bool value);
-string16 PropertyWithBounds(const std::string& prefix, const gfx::Rect& bounds);
-string16 PropertyWithInsets(const std::string& prefix,
-                            const gfx::Insets& insets);
+base::string16 PropertyWithInteger(const std::string& prefix, int value);
+base::string16 PropertyWithVoidStar(const std::string& prefix, void* ptr);
+base::string16 PropertyWithBool(const std::string& prefix, bool value);
+base::string16 PropertyWithBounds(const std::string& prefix,
+                                  const gfx::Rect& bounds);
+base::string16 PropertyWithInsets(const std::string& prefix,
+                                  const gfx::Insets& insets);
 
 }  // namespace internal
 }  // namespace oak
diff --git a/ui/oak/oak_tree_model.cc b/ui/oak/oak_tree_model.cc
index ff67ee5..82650b8 100644
--- a/ui/oak/oak_tree_model.cc
+++ b/ui/oak/oak_tree_model.cc
@@ -12,7 +12,7 @@
 namespace oak {
 namespace internal {
 
-string16 GetNodeTitleForWindow(aura::Window* window) {
+base::string16 GetNodeTitleForWindow(aura::Window* window) {
   std::string window_name = window->name();
   if (window_name.empty())
     window_name.append("Unnamed window");
diff --git a/ui/oak/oak_window.cc b/ui/oak/oak_window.cc
index 7cf7dff..e9f9b52 100644
--- a/ui/oak/oak_window.cc
+++ b/ui/oak/oak_window.cc
@@ -49,7 +49,7 @@ bool OakWindow::CanMaximize() const {
   return true;
 }
 
-string16 OakWindow::GetWindowTitle() const {
+base::string16 OakWindow::GetWindowTitle() const {
   return ASCIIToUTF16("Oak");
 }
 
diff --git a/ui/oak/oak_window.h b/ui/oak/oak_window.h
index 1dca2f8..335dc4d 100644
--- a/ui/oak/oak_window.h
+++ b/ui/oak/oak_window.h
@@ -30,7 +30,7 @@ class OakWindow : public views::WidgetDelegateView,
   // Overridden from views::WidgetDelegateView:
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
   virtual bool ShouldShowWindowIcon() const OVERRIDE;