summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/clear_browsing_data.h
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-18 01:04:45 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-18 01:04:45 +0000
commit733436966716d5307a251c2852931531edc9b963 (patch)
tree14f7a5d2538bb4a70852f5a3e0a6a8e0e94c1b43 /chrome/browser/views/clear_browsing_data.h
parent489d946c2d39713777826de69d02546c8307e54e (diff)
downloadchromium_src-733436966716d5307a251c2852931531edc9b963.zip
chromium_src-733436966716d5307a251c2852931531edc9b963.tar.gz
chromium_src-733436966716d5307a251c2852931531edc9b963.tar.bz2
Factor out views::Combobox::Model so that it can be used cross-platform.
This removes the Combobox* source arg from the Model methods, which wasn't really used by anything. BUG=none TEST=none Review URL: http://codereview.chromium.org/165514 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/clear_browsing_data.h')
-rw-r--r--chrome/browser/views/clear_browsing_data.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index cb84d08..f7b1743 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
#define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
+#include "app/combobox_model.h"
#include "chrome/browser/browsing_data_remover.h"
#include "views/controls/button/button.h"
#include "views/controls/combobox/combobox.h"
@@ -32,7 +33,7 @@ class MessageLoop;
class ClearBrowsingDataView : public views::View,
public views::DialogDelegate,
public views::ButtonListener,
- public views::Combobox::Model,
+ public ComboboxModel,
public views::Combobox::Listener,
public BrowsingDataRemover::Observer {
public:
@@ -63,9 +64,9 @@ class ClearBrowsingDataView : public views::View,
virtual bool Accept();
virtual views::View* GetContentsView();
- // Overridden from views::Combobox::Model:
- virtual int GetItemCount(views::Combobox* source);
- virtual std::wstring GetItemAt(views::Combobox* source, int index);
+ // Overridden from ComboboxModel:
+ virtual int GetItemCount();
+ virtual std::wstring GetItemAt(int index);
// Overridden from views::Combobox::Listener:
virtual void ItemChanged(views::Combobox* sender, int prev_index,