Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Unified Diff: ui/views/examples/examples_window.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/examples/example_combobox_model.cc ('k') | ui/views/examples/examples_window_with_content.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples_window.cc
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 041199286d13f2691a9fe1b9a09dce8237221e50..b8bcf50c497b5a56baf3034f72ab7c214ace327b 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; }
« no previous file with comments | « ui/views/examples/example_combobox_model.cc ('k') | ui/views/examples/examples_window_with_content.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698