Update src/ash/ for renames and moves in base

Renames string16 -> base::string16 and
base/string_number_conversions.h -> base/strings/string_number_conversions.h

BUG=

Review URL: https://codereview.chromium.org/13856005

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

1 files changed, 4 insertions, 4 deletions

diff --git a/ash/system/tray/throbber_view.cc b/ash/system/tray/throbber_view.cc
index 89d4ed4..2c2cc20 100644
--- a/ash/system/tray/throbber_view.cc
+++ b/ash/system/tray/throbber_view.cc
@@ -30,12 +30,12 @@ SystemTrayThrobber::SystemTrayThrobber(int frame_delay_ms)
 SystemTrayThrobber::~SystemTrayThrobber() {
 }
 
-void SystemTrayThrobber::SetTooltipText(const string16& tooltip_text) {
+void SystemTrayThrobber::SetTooltipText(const base::string16& tooltip_text) {
   tooltip_text_ = tooltip_text;
 }
 
 bool SystemTrayThrobber::GetTooltipText(const gfx::Point& p,
-                                        string16* tooltip) const {
+                                        base::string16* tooltip) const {
   if (tooltip_text_.empty())
     return false;
 
@@ -72,7 +72,7 @@ void ThrobberView::Layout() {
 }
 
 bool ThrobberView::GetTooltipText(const gfx::Point& p,
-                                  string16* tooltip) const {
+                                  base::string16* tooltip) const {
   if (tooltip_text_.empty())
     return false;
 
@@ -90,7 +90,7 @@ void ThrobberView::Stop() {
   throbber_->Stop();
 }
 
-void ThrobberView::SetTooltipText(const string16& tooltip_text) {
+void ThrobberView::SetTooltipText(const base::string16& tooltip_text) {
   tooltip_text_ = tooltip_text;
   throbber_->SetTooltipText(tooltip_text);
 }