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

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
13 #include "chrome/browser/ui/views/website_settings/chosen_object_view_observer.h " 14 #include "chrome/browser/ui/views/website_settings/chosen_object_view_observer.h "
14 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse rver.h" 15 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse rver.h"
15 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 16 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
16 #include "components/security_state/security_state_model.h" 17 #include "components/security_state/security_state_model.h"
17 #include "content/public/browser/web_contents_observer.h" 18 #include "content/public/browser/web_contents_observer.h"
18 #include "ui/views/bubble/bubble_dialog_delegate.h" 19 #include "ui/views/bubble/bubble_dialog_delegate.h"
19 #include "ui/views/controls/button/button.h" 20 #include "ui/views/controls/button/button.h"
20 #include "ui/views/controls/link_listener.h" 21 #include "ui/views/controls/link_listener.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 void HandleLinkClickedAsync(views::Link* source); 139 void HandleLinkClickedAsync(views::Link* source);
139 140
140 // Whether DevTools is disabled for the relevant profile. 141 // Whether DevTools is disabled for the relevant profile.
141 bool is_devtools_disabled_; 142 bool is_devtools_disabled_;
142 143
143 // The web contents of the current tab. The popup can't live longer than a 144 // The web contents of the current tab. The popup can't live longer than a
144 // tab. 145 // tab.
145 content::WebContents* web_contents_; 146 content::WebContents* web_contents_;
146 147
147 // The presenter that controls the Website Settings UI. 148 // The presenter that controls the Website Settings UI.
148 scoped_ptr<WebsiteSettings> presenter_; 149 std::unique_ptr<WebsiteSettings> presenter_;
149 150
150 // The header section (containing security-related information). 151 // The header section (containing security-related information).
151 PopupHeaderView* header_; 152 PopupHeaderView* header_;
152 153
153 // The separator between the header and the site settings view. 154 // The separator between the header and the site settings view.
154 views::Separator* separator_; 155 views::Separator* separator_;
155 156
156 // The view that contains the site data and permissions sections. 157 // The view that contains the site data and permissions sections.
157 views::View* site_settings_view_; 158 views::View* site_settings_view_;
158 // The view that contains the contents of the "Cookies and Site data" section 159 // The view that contains the contents of the "Cookies and Site data" section
(...skipping 12 matching lines...) Expand all
171 // The link to open the site settings page that provides full control over 172 // The link to open the site settings page that provides full control over
172 // the origin's permissions. 173 // the origin's permissions.
173 views::Link* site_settings_link_; 174 views::Link* site_settings_link_;
174 175
175 base::WeakPtrFactory<WebsiteSettingsPopupView> weak_factory_; 176 base::WeakPtrFactory<WebsiteSettingsPopupView> weak_factory_;
176 177
177 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView); 178 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
178 }; 179 };
179 180
180 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_ H_ 181 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698