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

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

Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated so that the yellow thing occurs only when the content setting is set to allow Created 6 years, 6 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 unified diff | Download patch
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Provides data for this bubble. 94 // Provides data for this bubble.
95 scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model_; 95 scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model_;
96 96
97 // Some of our controls, so we can tell what's been clicked when we get a 97 // Some of our controls, so we can tell what's been clicked when we get a
98 // message. 98 // message.
99 PopupLinks popup_links_; 99 PopupLinks popup_links_;
100 typedef std::vector<views::RadioButton*> RadioGroup; 100 typedef std::vector<views::RadioButton*> RadioGroup;
101 RadioGroup radio_group_; 101 RadioGroup radio_group_;
102 views::Link* custom_link_; 102 views::Link* custom_link_;
103 views::Link* manage_link_; 103 views::Link* manage_link_;
104 views::Link* learn_more_link_;
104 views::LabelButton* close_button_; 105 views::LabelButton* close_button_;
105 scoped_ptr<views::MenuRunner> menu_runner_; 106 scoped_ptr<views::MenuRunner> menu_runner_;
106 MediaMenuPartsMap media_menus_; 107 MediaMenuPartsMap media_menus_;
107 108
108 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents); 109 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents);
109 }; 110 };
110 111
111 #endif // CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ 112 #endif // CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698