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

Unified Diff: ui/views/examples/example_combobox_model.h

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/combobox_example.cc ('k') | ui/views/examples/example_combobox_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/example_combobox_model.h
diff --git a/ui/views/examples/example_combobox_model.h b/ui/views/examples/example_combobox_model.h
index 74262d8b90fd61f99621a05519a83804e4ec8e42..2c5ee8032d893164e3dee9d42b28c87650454c56 100644
--- a/ui/views/examples/example_combobox_model.h
+++ b/ui/views/examples/example_combobox_model.h
@@ -19,7 +19,7 @@ class ExampleComboboxModel : public ui::ComboboxModel {
// Overridden from ui::ComboboxModel:
virtual int GetItemCount() const OVERRIDE;
- virtual string16 GetItemAt(int index) OVERRIDE;
+ virtual base::string16 GetItemAt(int index) OVERRIDE;
private:
const char** strings_;
« no previous file with comments | « ui/views/examples/combobox_example.cc ('k') | ui/views/examples/example_combobox_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698