Move the number conversions from string_util to a new file....

chrome/browser/chromeos/status/power_menu_button.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/status/power_menu_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton
@@ skipping 25 matching lines @@
 }
 
 string16 PowerMenuButton::GetLabelAt(int index) const {
   PowerLibrary* cros = CrosLibrary::Get()->GetPowerLibrary();
   // The first item shows the percentage of battery left.
   if (index == 0) {
     // If fully charged, always show 100% even if internal number is a bit less.
     double percent = cros->battery_fully_charged() ? 100 :
                                                      cros->battery_percentage();
     return l10n_util::GetStringFUTF16(IDS_STATUSBAR_BATTERY_PERCENTAGE,
-        IntToString16(static_cast<int>(percent)));
+        base::IntToString16(static_cast<int>(percent)));
   }
 
   // The second item shows the battery is charged if it is.
   if (cros->battery_fully_charged())
     return l10n_util::GetStringUTF16(IDS_STATUSBAR_BATTERY_IS_CHARGED);
 
   // If battery is in an intermediate charge state, we show how much time left.
   base::TimeDelta time = cros->line_power_on() ? cros->battery_time_to_full() :
                                                  cros->battery_time_to_empty();
   if (time.InSeconds() == 0) {
     // If time is 0, then that means we are still calculating how much time.
     // Depending if line power is on, we either show a message saying that we
     // are calculating time until full or calculating remaining time.
     int msg = cros->line_power_on() ?
         IDS_STATUSBAR_BATTERY_CALCULATING_TIME_UNTIL_FULL :
         IDS_STATUSBAR_BATTERY_CALCULATING_TIME_UNTIL_EMPTY;
     return l10n_util::GetStringUTF16(msg);
   } else {
     // Depending if line power is on, we either show a message saying XX:YY
     // until full or XX:YY remaining where XX is number of hours and YY is
     // number of minutes.
     int msg = cros->line_power_on() ? IDS_STATUSBAR_BATTERY_TIME_UNTIL_FULL :
                                       IDS_STATUSBAR_BATTERY_TIME_UNTIL_EMPTY;
     int hour = time.InHours();
     int min = (time - base::TimeDelta::FromHours(hour)).InMinutes();
-    string16 hour_str = IntToString16(hour);
-    string16 min_str = IntToString16(min);
+    string16 hour_str = base::IntToString16(hour);
+    string16 min_str = base::IntToString16(min);
     // Append a "0" before the minute if it's only a single digit.
     if (min < 10)
       min_str = ASCIIToUTF16("0") + min_str;
     return l10n_util::GetStringFUTF16(msg, hour_str, min_str);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, views::ViewMenuDelegate implementation:
 
@@ skipping 78 matching lines @@
       index = std::max(std::min(index, kNumPowerImages - 1), 0);
       icon_id_ = cros->line_power_on() ?
           kChargingImages[index] : kDischargingImages[index];
     }
   }
   SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(icon_id_));
   SchedulePaint();
 }
 
 }  // namespace chromeos