Prefix string16 with base:: in ui/.

ui/views/controls/tabbed_pane/tabbed_pane.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/controls/tabbed_pane/tabbed_pane.h"
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
@@ skipping 15 matching lines @@
 }  // namespace
 
 namespace views {
 
 // static
 const char TabbedPane::kViewClassName[] = "TabbedPane";
 
 // The tab view shown in the tab strip.
 class Tab : public View {
  public:
-  Tab(TabbedPane* tabbed_pane, const string16& title, View* contents);
+  Tab(TabbedPane* tabbed_pane, const base::string16& title, View* contents);
   virtual ~Tab();
 
   View* contents() const { return contents_; }
 
   bool selected() const { return contents_->visible(); }
   void SetSelected(bool selected);
 
   // Overridden from View:
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
@@ skipping 31 matching lines @@
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   TabbedPane* tabbed_pane_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStrip);
 };
 
-Tab::Tab(TabbedPane* tabbed_pane, const string16& title, View* contents)
+Tab::Tab(TabbedPane* tabbed_pane, const base::string16& title, View* contents)
     : tabbed_pane_(tabbed_pane),
       title_(new Label(title, gfx::Font().DeriveFont(0, gfx::Font::BOLD))),
       tab_state_(TAB_ACTIVE),
       contents_(contents) {
   // Calculate this now while the font is guaranteed to be bold.
   preferred_title_size_ = title_->GetPreferredSize();
 
   SetState(TAB_INACTIVE);
   AddChildView(title_);
 }
@@ skipping 149 matching lines @@
 int TabbedPane::GetTabCount() {
   DCHECK_EQ(tab_strip_->child_count(), contents_->child_count());
   return contents_->child_count();
 }
 
 View* TabbedPane::GetSelectedTab() {
   return selected_tab_index() < 0 ?
       NULL : GetTabAt(selected_tab_index())->contents();
 }
 
-void TabbedPane::AddTab(const string16& title, View* contents) {
+void TabbedPane::AddTab(const base::string16& title, View* contents) {
   AddTabAtIndex(tab_strip_->child_count(), title, contents);
 }
 
 void TabbedPane::AddTabAtIndex(int index,
-                               const string16& title,
+                               const base::string16& title,
                                View* contents) {
   DCHECK(index >= 0 && index <= GetTabCount());
   contents->SetVisible(false);
 
   tab_strip_->AddChildViewAt(new Tab(this, title, contents), index);
   contents_->AddChildViewAt(contents, index);
   if (selected_tab_index() < 0)
     SelectTabAt(index);
 
   PreferredSizeChanged();
@@ skipping 88 matching lines @@
     selected_tab->NotifyAccessibilityEvent(
         ui::AccessibilityTypes::EVENT_FOCUS, true);
   }
 }
 
 void TabbedPane::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PAGETABLIST;
 }
 
 }  // namespace views