diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 20:03:44 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 20:03:44 +0000 |
| commit | 2aadf21d2ff4882cb94510e4107067a70a928850 (patch) | |
| tree | 8acbc4f186e6fc73a20292b2baca8efc954d47cb /ui/views/examples/examples_window.cc | |
| parent | df97969962d83bf8ad962bc3d46b824ebeee4af0 (diff) | |
| download | chromium_src-2aadf21d2ff4882cb94510e4107067a70a928850.zip chromium_src-2aadf21d2ff4882cb94510e4107067a70a928850.tar.gz chromium_src-2aadf21d2ff4882cb94510e4107067a70a928850.tar.bz2 | |
Prefix string16 with base:: in ui/.
R=sky@chromium.org, tsepez@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/117983002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples/examples_window.cc')
| -rw-r--r-- | ui/views/examples/examples_window.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc index 0411992..b8bcf50 100644 --- a/ui/views/examples/examples_window.cc +++ b/ui/views/examples/examples_window.cc @@ -51,7 +51,7 @@ class ComboboxModelExampleList : public ui::ComboboxModel { // Overridden from ui::ComboboxModel: virtual int GetItemCount() const OVERRIDE { return example_list_.size(); } - virtual string16 GetItemAt(int index) OVERRIDE { + virtual base::string16 GetItemAt(int index) OVERRIDE { return UTF8ToUTF16(example_list_[index]->example_title()); } @@ -97,7 +97,7 @@ class ExamplesWindowContents : public WidgetDelegateView, // Overridden from WidgetDelegateView: virtual bool CanResize() const OVERRIDE { return true; } virtual bool CanMaximize() const OVERRIDE { return true; } - virtual string16 GetWindowTitle() const OVERRIDE { + virtual base::string16 GetWindowTitle() const OVERRIDE { return ASCIIToUTF16("Views Examples"); } virtual View* GetContentsView() OVERRIDE { return this; } |