Chromium Code Reviews| Index: chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h |
| diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h |
| index 0b58ee17332586e31d36835816152c20c934e0ec..72422af7beccf630367ebfc7b7654c5e0989df89 100644 |
| --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h |
| +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h |
| @@ -33,6 +33,13 @@ class RenderViewContextMenuViews : public RenderViewContextMenu { |
| const gfx::Point& point, |
| ui::MenuSourceType type); |
| +#if !defined(OS_WIN) |
|
Peter Kasting
2013/11/22 21:53:03
Don't add so many #ifs. Use as few #ifs as possib
pals
2013/11/25 06:28:13
Done. Moved all the changes to a single #if.
|
| + // SimpleMenuModel::Delegate implementation. |
|
Peter Kasting
2013/11/22 21:53:03
You don't inherit from SimpleMenuModel::Delegate.
pals
2013/11/25 06:28:13
Done. Moved to private.
|
| + virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; |
| + virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; |
| + virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; |
| +#endif // !OS_WIN |
| + |
| // RenderViewContextMenuDelegate implementation. |
| virtual void UpdateMenuItem(int command_id, |
| bool enabled, |
| @@ -48,8 +55,19 @@ class RenderViewContextMenuViews : public RenderViewContextMenu { |
| virtual bool GetAcceleratorForCommandId( |
| int command_id, |
| ui::Accelerator* accelerator) OVERRIDE; |
| +#if !defined(OS_WIN) |
| + virtual void AppendPlatformEditableItems() OVERRIDE; |
| +#endif // !OS_WIN |
| private: |
| +#if !defined(OS_WIN) |
| + // Adds writing direction submenu. |
| + void AppendBidiSubMenu(); |
| + |
| + // Model for the BiDi input submenu. |
| + ui::SimpleMenuModel bidi_submenu_model_; |
| +#endif // !OS_WIN |
| + |
| scoped_ptr<views::MenuRunner> menu_runner_; |
| DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuViews); |