diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/browser/ui/views/content_setting_bubble_contents.h | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/browser/ui/views/content_setting_bubble_contents.h')
| -rw-r--r-- | chrome/browser/ui/views/content_setting_bubble_contents.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h index 25723a4..45e0635 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.h +++ b/chrome/browser/ui/views/content_setting_bubble_contents.h @@ -92,11 +92,9 @@ class ContentSettingBubbleContents : public views::View, PopupLinks popup_links_; typedef std::vector<views::RadioButton*> RadioGroup; RadioGroup radio_group_; - views::NativeButton* close_button_; + views::Link* custom_link_; views::Link* manage_link_; - views::Link* clear_link_; - views::Link* info_link_; - views::Link* load_plugins_link_; + views::NativeButton* close_button_; DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents); }; |