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

Unified Diff: chrome/browser/chromeos/options/language_config_view.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/chromeos/options/language_config_view.h
===================================================================
--- chrome/browser/chromeos/options/language_config_view.h (revision 70272)
+++ chrome/browser/chromeos/options/language_config_view.h (working copy)
@@ -11,6 +11,7 @@
#include <string>
#include "app/table_model.h"
+#include "base/compiler_specific.h"
#include "chrome/browser/chromeos/options/language_config_model.h"
#include "chrome/browser/views/options/options_page_view.h"
#include "views/controls/button/native_button.h"
@@ -64,9 +65,9 @@
// LanguageConfigView class, rather than a separate class.
// TODO(satorux): Implement TableModel as a separate class once the bug
// is fixed.
- virtual std::wstring GetText(int row, int column_id);
- virtual void SetObserver(TableModelObserver* observer);
- virtual int RowCount();
+ virtual string16 GetText(int row, int column_id) OVERRIDE;
+ virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
+ virtual int RowCount() OVERRIDE;
// views::Combobox::Listener overrides:
virtual void ItemChanged(views::Combobox* combobox,

Powered by Google App Engine
This is Rietveld 408576698