Prefix string16 with base:: in ui/.

ui/views/controls/button/text_button.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/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 181 matching lines @@
   } else {
     ui::NativeTheme::ExtraParams extra;
     ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
     theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
   }
 }
 
 
 // TextButtonBase -------------------------------------------------------------
 
-TextButtonBase::TextButtonBase(ButtonListener* listener, const string16& text)
+TextButtonBase::TextButtonBase(ButtonListener* listener,
+                               const base::string16& text)
     : CustomButton(listener),
       alignment_(ALIGN_LEFT),
       font_(ResourceBundle::GetSharedInstance().GetFont(
           ResourceBundle::BaseFont)),
       has_text_shadow_(false),
       active_text_shadow_color_(0),
       inactive_text_shadow_color_(0),
       text_shadow_offset_(gfx::Point(1, 1)),
       min_width_(0),
       min_height_(0),
@@ skipping 19 matching lines @@
   if (is_default == is_default_)
     return;
   is_default_ = is_default;
   if (is_default_)
     AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
   else
     RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
   SchedulePaint();
 }
 
-void TextButtonBase::SetText(const string16& text) {
+void TextButtonBase::SetText(const base::string16& text) {
   if (text == text_)
     return;
   text_ = text;
   SetAccessibleName(text);
   UpdateTextSize();
 }
 
 void TextButtonBase::SetFont(const gfx::Font& font) {
   font_ = font;
   UpdateTextSize();
@@ skipping 349 matching lines @@
 
 ui::NativeTheme::State TextButtonBase::GetForegroundThemeState(
   ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 
 // TextButton -----------------------------------------------------------------
 
-TextButton::TextButton(ButtonListener* listener, const string16& text)
+TextButton::TextButton(ButtonListener* listener, const base::string16& text)
     : TextButtonBase(listener, text),
       icon_placement_(ICON_ON_LEFT),
       has_hover_icon_(false),
       has_pushed_icon_(false),
       icon_text_spacing_(kDefaultIconTextSpacing),
       ignore_minimum_size_(true) {
   set_border(new TextButtonDefaultBorder);
   SetFocusPainter(Painter::CreateDashedFocusPainterWithInsets(
                       gfx::Insets(kFocusRectInset, kFocusRectInset,
                                   kFocusRectInset, kFocusRectInset)));
@@ skipping 122 matching lines @@
   if (show_multiple_icon_states_) {
     if (has_hover_icon_ && (state() == STATE_HOVERED))
       return icon_hover_;
     if (has_pushed_icon_ && (state() == STATE_PRESSED))
       return icon_pushed_;
   }
   return icon_;
 }
 
 }  // namespace views