summaryrefslogtreecommitdiffstats
path: root/chrome/browser/custom_home_pages_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/custom_home_pages_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/custom_home_pages_table_model.h')
-rw-r--r--chrome/browser/custom_home_pages_table_model.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/custom_home_pages_table_model.h b/chrome/browser/custom_home_pages_table_model.h
index 4115daa..6699fc1 100644
--- a/chrome/browser/custom_home_pages_table_model.h
+++ b/chrome/browser/custom_home_pages_table_model.h
@@ -10,6 +10,7 @@
#include <vector>
#include "app/table_model.h"
+#include "base/compiler_specific.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/favicon_service.h"
@@ -43,11 +44,11 @@ class CustomHomePagesTableModel : public TableModel {
std::vector<GURL> GetURLs();
// TableModel overrides:
- virtual int RowCount();
- virtual std::wstring GetText(int row, int column_id);
- virtual SkBitmap GetIcon(int row);
- virtual std::wstring GetTooltip(int row);
- virtual void SetObserver(TableModelObserver* observer);
+ virtual int RowCount() OVERRIDE;
+ virtual string16 GetText(int row, int column_id) OVERRIDE;
+ virtual SkBitmap GetIcon(int row) OVERRIDE;
+ virtual string16 GetTooltip(int row) OVERRIDE;
+ virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
private:
// Each item in the model is represented as an Entry. Entry stores the URL,
@@ -84,7 +85,7 @@ class CustomHomePagesTableModel : public TableModel {
int* entry_index);
// Returns the URL for a particular row, formatted for display to the user.
- std::wstring FormattedURL(int row) const;
+ string16 FormattedURL(int row) const;
// Set of entries we're showing.
std::vector<Entry> entries_;