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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 // views::MenuButtonListener: 95 // views::MenuButtonListener:
96 void OnMenuButtonClicked(views::MenuButton* source, 96 void OnMenuButtonClicked(views::MenuButton* source,
97 const gfx::Point& point, 97 const gfx::Point& point,
98 const ui::Event* event) override; 98 const ui::Event* event) override;
99 99
100 // Helper to get the preferred width of the media menu. 100 // Helper to get the preferred width of the media menu.
101 void UpdateMenuButtonSizes(); 101 void UpdateMenuButtonSizes();
102 102
103 // Provides data for this bubble. 103 // Provides data for this bubble.
104 scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model_; 104 std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model_;
105 105
106 // Some of our controls, so we can tell what's been clicked when we get a 106 // Some of our controls, so we can tell what's been clicked when we get a
107 // message. 107 // message.
108 ListItemLinks list_item_links_; 108 ListItemLinks list_item_links_;
109 typedef std::vector<views::RadioButton*> RadioGroup; 109 typedef std::vector<views::RadioButton*> RadioGroup;
110 RadioGroup radio_group_; 110 RadioGroup radio_group_;
111 views::Link* custom_link_; 111 views::Link* custom_link_;
112 views::Link* manage_link_; 112 views::Link* manage_link_;
113 views::Link* learn_more_link_; 113 views::Link* learn_more_link_;
114 views::LabelButton* close_button_; 114 views::LabelButton* close_button_;
115 scoped_ptr<views::MenuRunner> menu_runner_; 115 std::unique_ptr<views::MenuRunner> menu_runner_;
116 MediaMenuPartsMap media_menus_; 116 MediaMenuPartsMap media_menus_;
117 117
118 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents); 118 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents);
119 }; 119 };
120 120
121 #endif // CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ 121 #endif // CHROME_BROWSER_UI_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698