summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_exceptions_table_model.h
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-30 00:50:04 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-30 00:50:04 +0000
commitbdaab67c485eee51a098c7b34544c5d18bf725af (patch)
tree31e0c087b57c538ef91b6598040f2b7f2293505d /chrome/browser/content_exceptions_table_model.h
parentfbc7678b2f73707962861c99eb4c809604ddd611 (diff)
downloadchromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.zip
chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.gz
chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.bz2
Remove wstring from TableModel.
BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6044007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_exceptions_table_model.h')
-rw-r--r--chrome/browser/content_exceptions_table_model.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/content_exceptions_table_model.h b/chrome/browser/content_exceptions_table_model.h
index e01250b7..a8371fe 100644
--- a/chrome/browser/content_exceptions_table_model.h
+++ b/chrome/browser/content_exceptions_table_model.h
@@ -9,6 +9,7 @@
#include <string>
#include "app/table_model.h"
+#include "base/compiler_specific.h"
#include "base/ref_counted.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/content_settings_types.h"
@@ -53,9 +54,9 @@ class ContentExceptionsTableModel : public TableModel {
bool is_off_the_record);
// TableModel overrides:
- virtual int RowCount();
- virtual std::wstring GetText(int row, int column_id);
- virtual void SetObserver(TableModelObserver* observer);
+ virtual int RowCount() OVERRIDE;
+ virtual string16 GetText(int row, int column_id) OVERRIDE;
+ virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
private:
HostContentSettingsMap* map(bool is_off_the_record) {