diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 20:09:36 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 20:09:36 +0000 |
| commit | dd2cc808be553ce11d1ac3a1b7e8382ffca65293 (patch) | |
| tree | 097cc69a05043c74ad3793f9f26e263df0b7a6f9 /ui/views/examples/examples_window.cc | |
| parent | b6775d788c0bcc4bc879731478a2eadc522dc767 (diff) | |
| download | chromium_src-dd2cc808be553ce11d1ac3a1b7e8382ffca65293.zip chromium_src-dd2cc808be553ce11d1ac3a1b7e8382ffca65293.tar.gz chromium_src-dd2cc808be553ce11d1ac3a1b7e8382ffca65293.tar.bz2 | |
Update uses of UTF conversions in ui/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/106383004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples/examples_window.cc')
| -rw-r--r-- | ui/views/examples/examples_window.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc index b8bcf50..fae70f9 100644 --- a/ui/views/examples/examples_window.cc +++ b/ui/views/examples/examples_window.cc @@ -52,7 +52,7 @@ class ComboboxModelExampleList : public ui::ComboboxModel { // Overridden from ui::ComboboxModel: virtual int GetItemCount() const OVERRIDE { return example_list_.size(); } virtual base::string16 GetItemAt(int index) OVERRIDE { - return UTF8ToUTF16(example_list_[index]->example_title()); + return base::UTF8ToUTF16(example_list_[index]->example_title()); } View* GetItemViewAt(int index) { @@ -88,7 +88,7 @@ class ExamplesWindowContents : public WidgetDelegateView, // Prints a message in the status area, at the bottom of the window. void SetStatus(const std::string& status) { - status_label_->SetText(UTF8ToUTF16(status)); + status_label_->SetText(base::UTF8ToUTF16(status)); } static ExamplesWindowContents* instance() { return instance_; } @@ -98,7 +98,7 @@ class ExamplesWindowContents : public WidgetDelegateView, virtual bool CanResize() const OVERRIDE { return true; } virtual bool CanMaximize() const OVERRIDE { return true; } virtual base::string16 GetWindowTitle() const OVERRIDE { - return ASCIIToUTF16("Views Examples"); + return base::ASCIIToUTF16("Views Examples"); } virtual View* GetContentsView() OVERRIDE { return this; } virtual void WindowClosing() OVERRIDE { |