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

Unified Diff: chrome/browser/custom_home_pages_table_model.h

Issue 6044007: Remove wstring from TableModel.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years 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/custom_home_pages_table_model.h
===================================================================
--- chrome/browser/custom_home_pages_table_model.h (revision 70272)
+++ chrome/browser/custom_home_pages_table_model.h (working copy)
@@ -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 @@
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 @@
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_;

Powered by Google App Engine
This is Rietveld 408576698