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

Unified Diff: chrome/browser/ui/views/infobars/extension_infobar.cc

Issue 6354021: Disable context menu for page_action and infobars (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk version fixed Created 9 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
Index: chrome/browser/ui/views/infobars/extension_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index a48ee2dc62005a6da8c85a15143bcb6e80866697..b314603e33ca400a6122dd17eba037f08216a4e7 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -147,12 +147,16 @@ void ExtensionInfoBar::OnDelegateDeleted() {
}
void ExtensionInfoBar::RunMenu(View* source, const gfx::Point& pt) {
+ const Extension* extension = delegate_->extension_host()->extension();
+ if (!extension->ShowConfigureContextMenus())
+ return;
+
if (!options_menu_contents_.get()) {
Browser* browser = BrowserView::GetBrowserViewForNativeWindow(
platform_util::GetTopLevel(source->GetWidget()->GetNativeView()))->
browser();
options_menu_contents_ = new ExtensionContextMenuModel(
- delegate_->extension_host()->extension(), browser, NULL);
+ extension, browser, NULL);
}
options_menu_menu_.reset(new views::Menu2(options_menu_contents_.get()));

Powered by Google App Engine
This is Rietveld 408576698