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/views/frame | |
| 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/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 420b308..04d9988 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -1075,7 +1075,7 @@ bool BrowserView::IsLabelForCommandIdDynamic(int command_id) const { return command_id == IDC_RESTORE_TAB; } -std::wstring BrowserView::GetLabelForCommandId(int command_id) const { +string16 BrowserView::GetLabelForCommandId(int command_id) const { DCHECK(command_id == IDC_RESTORE_TAB); int string_id = IDS_RESTORE_TAB; @@ -1084,7 +1084,7 @@ std::wstring BrowserView::GetLabelForCommandId(int command_id) const { if (trs && trs->entries().front()->type == TabRestoreService::WINDOW) string_id = IDS_RESTORE_WINDOW; } - return l10n_util::GetString(string_id); + return l10n_util::GetStringUTF16(string_id); } void BrowserView::ExecuteCommand(int command_id) { diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h index c21b2a2..fd321ce 100644 --- a/chrome/browser/views/frame/browser_view.h +++ b/chrome/browser/views/frame/browser_view.h @@ -264,7 +264,7 @@ class BrowserView : public BrowserWindow, virtual bool GetAcceleratorForCommandId(int command_id, views::Accelerator* accelerator); virtual bool IsLabelForCommandIdDynamic(int command_id) const; - virtual std::wstring GetLabelForCommandId(int command_id) const; + virtual string16 GetLabelForCommandId(int command_id) const; virtual void ExecuteCommand(int command_id); // Overridden from views::WindowDelegate: |