Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 9316073: Expose contextual menu state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: shared linux build fix Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 0ca290c3addd018adf51c51119633b5b46c355be..e14fab9399778b621b252d67ebc3fcf28cc79e39 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -235,7 +235,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
is_loading_(false),
is_hidden_(false),
- is_showing_context_menu_(false),
weak_factory_(this),
accelerated_compositing_active_(false),
needs_gpu_visibility_update_after_repaint_(false),
@@ -497,7 +496,7 @@ void RenderWidgetHostViewMac::UpdateCursorIfNecessary() {
// a page? TODO(avi): decide
// Don't update the cursor if a context menu is being shown.
- if (is_showing_context_menu_)
+ if (showing_context_menu())
return;
// Can we synchronize to the event stream? Switch to -[NSWindow
@@ -694,9 +693,8 @@ void RenderWidgetHostViewMac::SelectionChanged(const string16& text,
}
}
-void RenderWidgetHostViewMac::ShowingContextMenu(bool showing) {
- DCHECK_NE(is_showing_context_menu_, showing);
- is_showing_context_menu_ = showing;
+void RenderWidgetHostViewMac::SetShowingContextMenu(bool showing) {
+ RenderWidgetHostView::SetShowingContextMenu(showing);
// If the menu was closed, restore the cursor to the saved version initially,
// as the renderer will not re-send it if there was no change.
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698