Convert string16 to base::string16 in content.

content/shell/browser/shell_views.cc

 // Copyright 2013 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.
 
 #include "content/shell/browser/shell.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 92 matching lines @@
     GetWidget()->SetBounds(bounds);
 
     // Resizing a widget on chromeos doesn't automatically resize the root, need
     // to explicitly do that.
 #if defined(OS_CHROMEOS)
     GetWidget()->GetNativeWindow()->GetDispatcher()->SetHostSize(
         bounds.size());
 #endif
   }
 
-  void SetWindowTitle(const string16& title) { title_ = title; }
+  void SetWindowTitle(const base::string16& title) { title_ = title; }
   void EnableUIControl(UIControl control, bool is_enabled) {
     if (control == BACK_BUTTON) {
       back_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
           : views::CustomButton::STATE_DISABLED);
     } else if (control == FORWARD_BUTTON) {
       forward_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
           : views::CustomButton::STATE_DISABLED);
     } else if (control == STOP_BUTTON) {
       stop_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
           : views::CustomButton::STATE_DISABLED);
@@ skipping 84 matching lines @@
     // Add web contents view as the second row
     {
       layout->StartRow(1, 0);
       layout->AddView(contents_view_);
     }
 
     layout->AddPaddingRow(0, 5);
   }
   // Overridden from TextfieldController
   virtual void ContentsChanged(views::Textfield* sender,
-                               const string16& new_contents) OVERRIDE {
+                               const base::string16& new_contents) OVERRIDE {
   }
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE {
    if (sender == url_entry_ && key_event.key_code() == ui::VKEY_RETURN) {
      std::string text = UTF16ToUTF8(url_entry_->text());
      GURL url(text);
      if (!url.has_scheme()) {
        url = GURL(std::string("http://") + std::string(text));
        url_entry_->SetText(ASCIIToUTF16(url.spec()));
      }
@@ skipping 12 matching lines @@
       shell_->GoBackOrForward(1);
     else if (sender == refresh_button_)
       shell_->Reload();
     else if (sender == stop_button_)
       shell_->Stop();
   }
 
   // Overridden from WidgetDelegateView
   virtual bool CanResize() const OVERRIDE { return true; }
   virtual bool CanMaximize() const OVERRIDE { return true; }
-  virtual string16 GetWindowTitle() const OVERRIDE {
+  virtual base::string16 GetWindowTitle() const OVERRIDE {
     return title_;
   }
   virtual void WindowClosing() OVERRIDE {
     if (shell_) {
       delete shell_;
       shell_ = NULL;
     }
   }
   virtual View* GetContentsView() OVERRIDE { return this; }
 
   // Overridden from View
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE {
     if (details.is_add && details.child == this) {
       InitShellWindow();
     }
   }
 
  private:
   // Hold a reference of Shell for deleting it when the window is closing
   Shell* shell_;
 
   // Window title
-  string16 title_;
+  base::string16 title_;
 
   // Toolbar view contains forward/backward/reload button and URL entry
   View* toolbar_view_;
   views::LabelButton* back_button_;
   views::LabelButton* forward_button_;
   views::LabelButton* refresh_button_;
   views::LabelButton* stop_button_;
   views::Textfield* url_entry_;
 
   // Contents view contains the web contents view
@@ skipping 94 matching lines @@
   delegate_view->SetWebContents(web_contents_.get(), content_size_);
 }
 
 void Shell::PlatformResizeSubViews() {
 }
 
 void Shell::Close() {
   window_widget_->CloseNow();
 }
 
-void Shell::PlatformSetTitle(const string16& title) {
+void Shell::PlatformSetTitle(const base::string16& title) {
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);
   window_widget_->UpdateWindowTitle();
 }
 
 }  // namespace content