Skip to content

Commit

Permalink
[DevTools] Whitelist default context menu options for DevTools.
Browse files Browse the repository at this point in the history
BUG=398867

Review URL: https://codereview.chromium.org/431943003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287114 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
dgozman@chromium.org committed Aug 1, 2014
1 parent 80bfc66 commit 35d96d0
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions components/renderer_context_menu/context_menu_content_type.cc
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ bool ContextMenuContentType::SupportsGroup(int group) {
// adding the normal ones after the custom ones.
}

if (IsDevToolsURL(params_.page_url)) {
// DevTools mostly provides custom context menu and uses
// only the following default options.
if (group != ITEM_GROUP_CUSTOM &&
group != ITEM_GROUP_EDITABLE &&
group != ITEM_GROUP_COPY &&
group != ITEM_GROUP_DEVELOPER) {
return false;
}
}

return SupportsGroupInternal(group);
}

Expand All @@ -94,15 +105,13 @@ bool ContextMenuContentType::SupportsGroupInternal(int group) {
DCHECK(params_.frame_url.is_empty());

return is_candidate && !params_.page_url.is_empty() &&
!IsDevToolsURL(params_.page_url) &&
!IsInternalResourcesURL(params_.page_url);
}

case ITEM_GROUP_FRAME: {

bool page_group_supported = SupportsGroupInternal(ITEM_GROUP_PAGE);
return page_group_supported && !params_.frame_url.is_empty() &&
!IsDevToolsURL(params_.frame_url) &&
!IsInternalResourcesURL(params_.page_url);
}

Expand Down Expand Up @@ -145,13 +154,12 @@ bool ContextMenuContentType::SupportsGroupInternal(int group) {
return has_selection;

case ITEM_GROUP_PRINT: {
bool enable = has_selection && !IsDevToolsURL(params_.page_url);
// Image menu items also imply print items.
return enable || SupportsGroupInternal(ITEM_GROUP_MEDIA_IMAGE);
return has_selection || SupportsGroupInternal(ITEM_GROUP_MEDIA_IMAGE);
}

case ITEM_GROUP_ALL_EXTENSION:
return !IsDevToolsURL(params_.page_url);
return true;

case ITEM_GROUP_CURRENT_EXTENSION:
return false;
Expand Down

0 comments on commit 35d96d0

Please sign in to comment.