chrome/browser/ui/views/content_setting_bubble_contents.h - Issue 1025503002: Use same base class for popup and plugin blocking UI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/content_setting_bubble_contents.h

Issue 1025503002: Use same base class for popup and plugin blocking UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: bauerb comments Created 5 years, 9 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 | « chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/ui/views/content_setting_bubble_contents.cc » ('j') | chrome/browser/ui/views/content_setting_bubble_contents.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/content_setting_bubble_contents.h

diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h

index 30ad088580634e4e7b831cd3033237e6d199e86a..62968a464e258115e27df4b010678d2274e72dfc 100644

--- a/chrome/browser/ui/views/content_setting_bubble_contents.h

+++ b/chrome/browser/ui/views/content_setting_bubble_contents.h

@@ -68,7 +68,7 @@ class ContentSettingBubbleContents : public content::WebContentsObserver,

class Favicon;

struct MediaMenuParts;

- typedef std::map<views::Link*, int> PopupLinks;

+ typedef std::map<views::Link*, int> ListItemLinks;

typedef std::map<views::MenuButton*, MediaMenuParts*> MediaMenuPartsMap;

// content::WebContentsObserver:

@@ -97,7 +97,7 @@ class ContentSettingBubbleContents : public content::WebContentsObserver,

// Some of our controls, so we can tell what's been clicked when we get a

// message.

- PopupLinks popup_links_;

+ ListItemLinks list_item_links_;

typedef std::vector<views::RadioButton*> RadioGroup;

RadioGroup radio_group_;

views::Link* custom_link_;