| Index: content/browser/renderer_host/render_widget_host_view_mac.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
|
| index 94b159828ac3908555e13c54347be523ce4ba5ab..bd5a23b6a36b59f11a73ec4ca23e104f6fa216df 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
|
| @@ -211,7 +211,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
|
| virtual void SelectionChanged(const string16& text,
|
| size_t offset,
|
| const ui::Range& range) OVERRIDE;
|
| - virtual void ShowingContextMenu(bool showing) OVERRIDE;
|
| + virtual void SetShowingContextMenu(bool showing) OVERRIDE;
|
| virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
|
| virtual void OnAcceleratedCompositingStateChange() OVERRIDE;
|
| virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE;
|
| @@ -269,9 +269,6 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
|
| virtual gfx::Rect GetRootWindowBounds() OVERRIDE;
|
| virtual gfx::PluginWindowHandle GetCompositingSurface() OVERRIDE;
|
|
|
| - // Returns |true| if a context menu is currently being shown.
|
| - bool is_showing_context_menu() const { return is_showing_context_menu_; }
|
| -
|
| void DrawAcceleratedSurfaceInstance(
|
| CGLContextObj context,
|
| gfx::PluginWindowHandle plugin_handle,
|
| @@ -380,9 +377,6 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
|
| // true if the View is not visible.
|
| bool is_hidden_;
|
|
|
| - // Whether we are showing a context menu.
|
| - bool is_showing_context_menu_;
|
| -
|
| // The text to be shown in the tooltip, supplied by the renderer.
|
| string16 tooltip_text_;
|
|
|
|
|