summaryrefslogtreecommitdiffstats
path: root/ash/shell/toplevel_window.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 04:03:32 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 04:03:32 +0000
commited95e02da69e469de255362cdb4114fe8e4c0c64 (patch)
tree5bb68bc6517f35f14ca98498cbc4f52f8b3dcfff /ash/shell/toplevel_window.cc
parent603af7ca8d0238e9b1a12b14a67655b831b047b7 (diff)
downloadchromium_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/toplevel_window.cc')
-rw-r--r--ash/shell/toplevel_window.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/toplevel_window.cc b/ash/shell/toplevel_window.cc
index 2a104bb..af18151 100644
--- a/ash/shell/toplevel_window.cc
+++ b/ash/shell/toplevel_window.cc
@@ -55,7 +55,7 @@ void ToplevelWindow::OnPaint(gfx::Canvas* canvas) {
canvas->FillRect(GetLocalBounds(), SK_ColorDKGRAY);
}
-string16 ToplevelWindow::GetWindowTitle() const {
+base::string16 ToplevelWindow::GetWindowTitle() const {
return params_.persist_across_all_workspaces ?
ASCIIToUTF16("Examples: Toplevel Window (P)") :
ASCIIToUTF16("Examples: Toplevel Window");