Prefix string16 with base:: in ui/.

ui/views/test/child_modal_window.cc

 // 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.
 
 #include "ui/views/test/child_modal_window.h"
 
 #include "base/strings/utf_string_conversions.h"  // ASCIIToUTF16
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
@@ skipping 47 matching lines @@
   ChildModalWindow();
   virtual ~ChildModalWindow();
 
  private:
   // Overridden from View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // Overridden from WidgetDelegate:
   virtual View* GetContentsView() OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual bool CanResize() const OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ChildModalWindow);
 };
 
 ChildModalWindow::ChildModalWindow() {
   Textfield* textfield = new Textfield;
   AddChildView(textfield);
   textfield->SetBounds(
       kChildTextfieldLeft, kChildTextfieldTop,
       kChildTextfieldWidth, kChildTextfieldHeight);
 }
 
 ChildModalWindow::~ChildModalWindow() {
 }
 
 void ChildModalWindow::OnPaint(gfx::Canvas* canvas) {
   canvas->FillRect(GetLocalBounds(), kChildColor);
 }
 
 gfx::Size ChildModalWindow::GetPreferredSize() {
   return gfx::Size(kChildWindowWidth, kChildWindowHeight);
 }
 
 View* ChildModalWindow::GetContentsView() {
   return this;
 }
 
-string16 ChildModalWindow::GetWindowTitle() const {
+base::string16 ChildModalWindow::GetWindowTitle() const {
   return ASCIIToUTF16("Examples: Child Modal Window");
 }
 
 bool ChildModalWindow::CanResize() const {
   return false;
 }
 
 ui::ModalType ChildModalWindow::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
@@ skipping 43 matching lines @@
   corewm::SetModalParent(child->GetNativeView(), GetModalParent());
   child->AddObserver(this);
   child->GetNativeView()->SetName("ChildModalWindow");
   return child;
 }
 
 View* ChildModalParent::GetContentsView() {
   return this;
 }
 
-string16 ChildModalParent::GetWindowTitle() const {
+base::string16 ChildModalParent::GetWindowTitle() const {
   return ASCIIToUTF16("Examples: Child Modal Parent");
 }
 
 bool ChildModalParent::CanResize() const {
   return false;
 }
 
 void ChildModalParent::DeleteDelegate() {
   if (child_) {
     child_->RemoveObserver(this);
@@ skipping 35 matching lines @@
 
 void ChildModalParent::OnWidgetDestroying(Widget* widget) {
   if (child_) {
     DCHECK_EQ(child_, widget);
     child_ = NULL;
   }
 }
 
 }  // namespace test
 }  // namespace views