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/shell_delegate.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/shell_delegate.h')
| -rw-r--r-- | ash/shell_delegate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h index 97c0952..e57eebd 100644 --- a/ash/shell_delegate.h +++ b/ash/shell_delegate.h @@ -236,10 +236,10 @@ class ASH_EXPORT ShellDelegate { // Produces l10n-ed text of remaining time, e.g.: "13 minutes left" or // "13 Minuten übrig". // Used, for example, to display the remaining battery life. - virtual string16 GetTimeRemainingString(base::TimeDelta delta) = 0; + virtual base::string16 GetTimeRemainingString(base::TimeDelta delta) = 0; // Produces l10n-ed text for time duration, e.g.: "13 minutes" or "2 hours". - virtual string16 GetTimeDurationLongString(base::TimeDelta delta) = 0; + virtual base::string16 GetTimeDurationLongString(base::TimeDelta delta) = 0; // Saves the zoom scale of the full screen magnifier. virtual void SaveScreenMagnifierScale(double scale) = 0; @@ -256,7 +256,7 @@ class ASH_EXPORT ShellDelegate { virtual RootWindowHostFactory* CreateRootWindowHostFactory() = 0; // Get the product name. - virtual string16 GetProductName() const = 0; + virtual base::string16 GetProductName() const = 0; }; } // namespace ash |