diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 16:23:25 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 16:23:25 +0000 |
| commit | b57c9d55d3dc1b31cd806c3861f7356bbd3ff2b7 (patch) | |
| tree | dcdf7e81b7f0ff38f4ac891ab9373eb7db9d0cbe /ash/shell_unittest.cc | |
| parent | 5b871bca736fe4228c3c2efdfcd7ad619449d362 (diff) | |
| download | chromium_src-b57c9d55d3dc1b31cd806c3861f7356bbd3ff2b7.zip chromium_src-b57c9d55d3dc1b31cd806c3861f7356bbd3ff2b7.tar.gz chromium_src-b57c9d55d3dc1b31cd806c3861f7356bbd3ff2b7.tar.bz2 | |
Update uses of UTF conversions in android_webview/, apps/, ash/, chrome/app to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/102443009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 99a67d4..72a4524 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -102,7 +102,7 @@ class ModalWindow : public views::WidgetDelegateView { return true; } virtual base::string16 GetWindowTitle() const OVERRIDE { - return ASCIIToUTF16("Modal Window"); + return base::ASCIIToUTF16("Modal Window"); } virtual ui::ModalType GetModalType() const OVERRIDE { return ui::MODAL_TYPE_SYSTEM; @@ -371,7 +371,7 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) { SimpleMenuDelegate menu_delegate; scoped_ptr<ui::SimpleMenuModel> menu_model( new ui::SimpleMenuModel(&menu_delegate)); - menu_model->AddItem(0, ASCIIToUTF16("Menu item")); + menu_model->AddItem(0, base::ASCIIToUTF16("Menu item")); views::Widget* widget = ash::Shell::GetPrimaryRootWindowController()-> wallpaper_controller()->widget(); scoped_ptr<views::MenuRunner> menu_runner( |