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

Unified Diff: chrome/browser/views/options/fonts_page_view.h

Issue 113991: Make Combobox portable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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
Index: chrome/browser/views/options/fonts_page_view.h
===================================================================
--- chrome/browser/views/options/fonts_page_view.h (revision 17310)
+++ chrome/browser/views/options/fonts_page_view.h (working copy)
@@ -8,7 +8,7 @@
#include "chrome/browser/views/options/options_page_view.h"
#include "chrome/browser/shell_dialogs.h"
#include "chrome/common/pref_member.h"
-#include "views/controls/combo_box.h"
+#include "views/controls/combobox/combobox.h"
#include "views/controls/button/button.h"
#include "views/view.h"
@@ -28,7 +28,7 @@
// FontsPageView
class FontsPageView : public OptionsPageView,
- public views::ComboBox::Listener,
+ public views::Combobox::Listener,
public SelectFontDialog::Listener,
public views::ButtonListener {
public:
@@ -38,8 +38,8 @@
// views::ButtonListener implementation:
virtual void ButtonPressed(views::Button* sender);
- // views::ComboBox::Listener implementation:
- virtual void ItemChanged(views::ComboBox* combo_box,
+ // views::Combobox::Listener implementation:
+ virtual void ItemChanged(views::Combobox* combo_box,
int prev_index,
int new_index);
@@ -117,7 +117,7 @@
// Default Encoding.
scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_;
views::Label* default_encoding_combobox_label_;
- views::ComboBox* default_encoding_combobox_;
+ views::Combobox* default_encoding_combobox_;
std::wstring default_encoding_selected_;
bool default_encoding_changed_;
« no previous file with comments | « chrome/browser/views/options/advanced_contents_view.cc ('k') | chrome/browser/views/options/fonts_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698