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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_setting_combo_model.h

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 months 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 | « chrome/browser/chromeos/options/system_page_view.cc ('k') | chrome/browser/content_setting_combo_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_setting_combo_model.h
diff --git a/chrome/browser/content_setting_combo_model.h b/chrome/browser/content_setting_combo_model.h
index bb00acd203a0fc00a265d5412f5dc85cf714a14c..dac487f031e1fac79ceefa03f08ae5784e64a841 100644
--- a/chrome/browser/content_setting_combo_model.h
+++ b/chrome/browser/content_setting_combo_model.h
@@ -9,6 +9,7 @@
#include "app/combobox_model.h"
#include "base/basictypes.h"
+#include "base/string16.h"
#include "chrome/common/content_settings.h"
class ContentSettingComboModel : public ComboboxModel {
@@ -17,8 +18,7 @@ class ContentSettingComboModel : public ComboboxModel {
virtual ~ContentSettingComboModel();
virtual int GetItemCount();
-
- virtual std::wstring GetItemAt(int index);
+ virtual string16 GetItemAt(int index);
ContentSetting SettingForIndex(int index);
« no previous file with comments | « chrome/browser/chromeos/options/system_page_view.cc ('k') | chrome/browser/content_setting_combo_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698