summaryrefslogtreecommitdiffstats
path: root/chrome/browser/back_forward_menu_model_views.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 16:21:17 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 16:21:17 +0000
commita5176dafb70d5ea7567b18917d85c4cddc937dc4 (patch)
tree45a3a875cb48ee3b54a536ba9a4a7a5902138650 /chrome/browser/back_forward_menu_model_views.h
parent8e12ae06a009107635e2045db802907fd4ae2df1 (diff)
downloadchromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.zip
chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.gz
chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.bz2
Convert menu strings to UTF16, fix some views-GTK build errors.
Review URL: http://codereview.chromium.org/150171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/back_forward_menu_model_views.h')
-rw-r--r--chrome/browser/back_forward_menu_model_views.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/back_forward_menu_model_views.h b/chrome/browser/back_forward_menu_model_views.h
index e97a39a..03d5e11 100644
--- a/chrome/browser/back_forward_menu_model_views.h
+++ b/chrome/browser/back_forward_menu_model_views.h
@@ -30,7 +30,7 @@ class BackForwardMenuModelViews : public BackForwardMenuModel,
virtual int GetItemCount() const;
virtual ItemType GetTypeAt(int index) const;
virtual int GetCommandIdAt(int index) const;
- virtual std::wstring GetLabelAt(int index) const;
+ virtual string16 GetLabelAt(int index) const;
virtual bool IsLabelDynamicAt(int index) const;
virtual bool GetAcceleratorAt(int index,
views::Accelerator* accelerator) const;