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

Side by Side Diff: chrome/browser/ui/views/content_setting_bubble_contents.h

Issue 1514693006: Revert of Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase revert on https://codereview.chromium.org/1504743003 Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/content_setting_bubble_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
6 #define CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 struct MediaMenuParts; 69 struct MediaMenuParts;
70 70
71 typedef std::map<views::Link*, int> ListItemLinks; 71 typedef std::map<views::Link*, int> ListItemLinks;
72 typedef std::map<views::MenuButton*, MediaMenuParts*> MediaMenuPartsMap; 72 typedef std::map<views::MenuButton*, MediaMenuParts*> MediaMenuPartsMap;
73 73
74 // content::WebContentsObserver: 74 // content::WebContentsObserver:
75 void DidNavigateMainFrame( 75 void DidNavigateMainFrame(
76 const content::LoadCommittedDetails& details, 76 const content::LoadCommittedDetails& details,
77 const content::FrameNavigateParams& params) override; 77 const content::FrameNavigateParams& params) override;
78 78
79 // views::View:
80 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
81
79 // views::ButtonListener: 82 // views::ButtonListener:
80 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 83 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
81 84
82 // views::LinkListener: 85 // views::LinkListener:
83 void LinkClicked(views::Link* source, int event_flags) override; 86 void LinkClicked(views::Link* source, int event_flags) override;
84 87
85 // views::MenuButtonListener: 88 // views::MenuButtonListener:
86 void OnMenuButtonClicked(views::View* source, 89 void OnMenuButtonClicked(views::View* source,
87 const gfx::Point& point) override; 90 const gfx::Point& point) override;
88 91
89 // Helper to get the preferred width of the media menu. 92 // Helper to get the preferred width of the media menu.
90 void UpdateMenuButtonSizes(); 93 void UpdateMenuButtonSizes(const ui::NativeTheme* theme);
91 94
92 // Provides data for this bubble. 95 // Provides data for this bubble.
93 scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model_; 96 scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model_;
94 97
95 // Some of our controls, so we can tell what's been clicked when we get a 98 // Some of our controls, so we can tell what's been clicked when we get a
96 // message. 99 // message.
97 ListItemLinks list_item_links_; 100 ListItemLinks list_item_links_;
98 typedef std::vector<views::RadioButton*> RadioGroup; 101 typedef std::vector<views::RadioButton*> RadioGroup;
99 RadioGroup radio_group_; 102 RadioGroup radio_group_;
100 views::Link* custom_link_; 103 views::Link* custom_link_;
101 views::Link* manage_link_; 104 views::Link* manage_link_;
102 views::Link* learn_more_link_; 105 views::Link* learn_more_link_;
103 views::LabelButton* close_button_; 106 views::LabelButton* close_button_;
104 scoped_ptr<views::MenuRunner> menu_runner_; 107 scoped_ptr<views::MenuRunner> menu_runner_;
105 MediaMenuPartsMap media_menus_; 108 MediaMenuPartsMap media_menus_;
106 109
107 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents); 110 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents);
108 }; 111 };
109 112
110 #endif // CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ 113 #endif // CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/content_setting_bubble_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698