diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 04:03:32 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 04:03:32 +0000 |
| commit | ed95e02da69e469de255362cdb4114fe8e4c0c64 (patch) | |
| tree | 5bb68bc6517f35f14ca98498cbc4f52f8b3dcfff /ash/system/power/power_status_view.h | |
| parent | 603af7ca8d0238e9b1a12b14a67655b831b047b7 (diff) | |
| download | chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.zip chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.gz chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.bz2 | |
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
Diffstat (limited to 'ash/system/power/power_status_view.h')
| -rw-r--r-- | ash/system/power/power_status_view.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/system/power/power_status_view.h b/ash/system/power/power_status_view.h index f394b06..d7a49c4 100644 --- a/ash/system/power/power_status_view.h +++ b/ash/system/power/power_status_view.h @@ -27,7 +27,7 @@ class PowerStatusView : public views::View { virtual ~PowerStatusView() {} void UpdatePowerStatus(const PowerSupplyStatus& status); - const string16& accessible_name() const { return accessible_name_; } + const base::string16& accessible_name() const { return accessible_name_; } // Overridden from views::View. virtual gfx::Size GetPreferredSize() OVERRIDE; @@ -42,7 +42,7 @@ class PowerStatusView : public views::View { void UpdateTextForDefaultView(); void UpdateTextForNotificationView(); int GetRoundedBatteryPercentage() const; - string16 GetBatteryTimeAccessibilityString(int hour, int min); + base::string16 GetBatteryTimeAccessibilityString(int hour, int min); // Overridden from views::View. virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; @@ -69,7 +69,7 @@ class PowerStatusView : public views::View { PowerSupplyStatus supply_status_; - string16 accessible_name_; + base::string16 accessible_name_; DISALLOW_COPY_AND_ASSIGN(PowerStatusView); }; |