diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
| commit | a5176dafb70d5ea7567b18917d85c4cddc937dc4 (patch) | |
| tree | 45a3a875cb48ee3b54a536ba9a4a7a5902138650 /chrome/browser/back_forward_menu_model.h | |
| parent | 8e12ae06a009107635e2045db802907fd4ae2df1 (diff) | |
| download | chromium_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.h')
| -rw-r--r-- | chrome/browser/back_forward_menu_model.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/back_forward_menu_model.h b/chrome/browser/back_forward_menu_model.h index 9f85a7e..acbcdaf 100644 --- a/chrome/browser/back_forward_menu_model.h +++ b/chrome/browser/back_forward_menu_model.h @@ -8,6 +8,7 @@ #include <string> #include "base/basictypes.h" +#include "base/string16.h" class Browser; class SkBitmap; @@ -92,7 +93,7 @@ class BackForwardMenuModel { // Get the display text for the item. This should not be called on a // separator. - std::wstring GetItemLabel(int menu_id) const; + string16 GetItemLabel(int menu_id) const; // Get the display icon for the item. This should not be called on a // separator or an item that does not have an icon. @@ -112,7 +113,7 @@ class BackForwardMenuModel { #endif // Allow the unit test to use the "Show Full History" label. - std::wstring GetShowFullHistoryLabel() const; + string16 GetShowFullHistoryLabel() const; // Retrieves the TabContents pointer to use, which is either the one that // the unit test sets (using SetTabContentsForUnitTest) or the one from |