diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 18:09:28 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 18:09:28 +0000 |
| commit | 1d20cdf4cb74b3a1b47c7bd62d3e3d17be4c6013 (patch) | |
| tree | c6fb735e4c27f3e693e2607ca2e02fede2288834 /chrome/browser/tab_contents | |
| parent | 3843213f9024e066f7107c071dc711be31f44487 (diff) | |
| download | chromium_src-1d20cdf4cb74b3a1b47c7bd62d3e3d17be4c6013.zip chromium_src-1d20cdf4cb74b3a1b47c7bd62d3e3d17be4c6013.tar.gz chromium_src-1d20cdf4cb74b3a1b47c7bd62d3e3d17be4c6013.tar.bz2 | |
Fix some of the more common chromium-style errors on the mac clang builder.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/6525038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu_mac.h | 4 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu_mac.mm | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu_mac.h b/chrome/browser/tab_contents/render_view_context_menu_mac.h index 58a8eaf..b537db4 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_mac.h +++ b/chrome/browser/tab_contents/render_view_context_menu_mac.h @@ -29,9 +29,7 @@ class RenderViewContextMenuMac : public RenderViewContextMenu { virtual void PlatformInit(); virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) { - return false; - } + ui::Accelerator* accelerator); virtual void LookUpInDictionary(); diff --git a/chrome/browser/tab_contents/render_view_context_menu_mac.mm b/chrome/browser/tab_contents/render_view_context_menu_mac.mm index ef0cf60..13301cb 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_mac.mm +++ b/chrome/browser/tab_contents/render_view_context_menu_mac.mm @@ -59,6 +59,12 @@ void RenderViewContextMenuMac::PlatformInit() { } } +bool RenderViewContextMenuMac::GetAcceleratorForCommandId( + int command_id, + ui::Accelerator* accelerator) { + return false; +} + void RenderViewContextMenuMac::InitPlatformMenu() { bool has_selection = !params_.selection_text.empty(); |