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

Unified Diff: chrome/browser/tab_contents/render_view_context_menu.cc

Issue 8588039: Remove "open in new tab" items from context menu if the process doesn't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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/tab_contents/render_view_context_menu.cc
===================================================================
--- chrome/browser/tab_contents/render_view_context_menu.cc (revision 113019)
+++ chrome/browser/tab_contents/render_view_context_menu.cc (working copy)
@@ -507,7 +507,7 @@
}
void RenderViewContextMenu::InitMenu() {
- bool has_link = !params_.link_url.is_empty();
+ bool has_link = !params_.unfiltered_link_url.is_empty();
bool has_selection = !params_.selection_text.empty();
if (AppendCustomItems()) {
@@ -667,19 +667,22 @@
}
void RenderViewContextMenu::AppendLinkItems() {
- menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB,
- IDS_CONTENT_CONTEXT_OPENLINKNEWTAB);
- menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW,
- IDS_CONTENT_CONTEXT_OPENLINKNEWWINDOW);
- if (params_.link_url.is_valid()) {
- AppendProtocolHandlerSubMenu();
+ if (!params_.link_url.is_empty()) {
+ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB,
+ IDS_CONTENT_CONTEXT_OPENLINKNEWTAB);
+ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW,
+ IDS_CONTENT_CONTEXT_OPENLINKNEWWINDOW);
+ if (params_.link_url.is_valid()) {
+ AppendProtocolHandlerSubMenu();
+ }
+
+ if (!external_) {
+ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD,
+ IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD);
+ }
+ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVELINKAS,
+ IDS_CONTENT_CONTEXT_SAVELINKAS);
}
- if (!external_) {
- menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD,
- IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD);
- }
- menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVELINKAS,
- IDS_CONTENT_CONTEXT_SAVELINKAS);
menu_model_.AddItemWithStringId(
IDC_CONTENT_CONTEXT_COPYLINKLOCATION,

Powered by Google App Engine
This is Rietveld 408576698