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

Unified Diff: components/renderer_context_menu/render_view_context_menu_base.cc

Issue 2890143003: Move ContextMenu show/hide state tracking to WebContents (Closed)
Patch Set: Remove #if def Created 3 years, 6 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
Index: components/renderer_context_menu/render_view_context_menu_base.cc
diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
index f9663f333e31c3b79b86a15e30cf4380436ba2ed..709931ac8043233dbf0666f043d5da4fde584462 100644
--- a/components/renderer_context_menu/render_view_context_menu_base.cc
+++ b/components/renderer_context_menu/render_view_context_menu_base.cc
@@ -333,10 +333,7 @@ void RenderViewContextMenuBase::MenuWillShow(ui::SimpleMenuModel* source) {
if (source != &menu_model_)
return;
- content::RenderWidgetHostView* view =
- source_web_contents_->GetRenderWidgetHostView();
- if (view)
- view->SetShowingContextMenu(true);
+ source_web_contents_->SetShowingContextMenu(true);
NotifyMenuShown();
}
@@ -346,10 +343,7 @@ void RenderViewContextMenuBase::MenuClosed(ui::SimpleMenuModel* source) {
if (source != &menu_model_)
return;
- content::RenderWidgetHostView* view =
- source_web_contents_->GetRenderWidgetHostView();
- if (view)
- view->SetShowingContextMenu(false);
+ source_web_contents_->SetShowingContextMenu(false);
source_web_contents_->NotifyContextMenuClosed(params_.custom_context);
}

Powered by Google App Engine
This is Rietveld 408576698