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/keyboard_overlay | |
| 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/keyboard_overlay')
| -rw-r--r-- | ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc index 95c048de..2605263 100644 --- a/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc +++ b/ash/keyboard_overlay/keyboard_overlay_delegate_unittest.cc @@ -37,7 +37,7 @@ TEST_P(KeyboardOverlayDelegateTest, ShowAndClose) { UpdateDisplay("500x400,300x200"); ash::Shell* shell = ash::Shell::GetInstance(); shell->SetShelfAlignment(shelf_alignment(), shell->GetPrimaryRootWindow()); - KeyboardOverlayDelegate delegate(ASCIIToUTF16("Title"), + KeyboardOverlayDelegate delegate(base::ASCIIToUTF16("Title"), GURL("chrome://keyboardoverlay/")); // Showing the dialog creates a widget. views::Widget* widget = delegate.Show(NULL); |