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

Side by Side Diff: chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h

Issue 1870793002: Convert //chrome/browser/chromeos 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_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/time/time.h" 12 #include "base/time/time.h"
12 #include "ui/views/widget/widget_observer.h" 13 #include "ui/views/widget/widget_observer.h"
13 14
14 namespace content { 15 namespace content {
15 class WebContents; 16 class WebContents;
16 } 17 }
17 18
18 namespace views { 19 namespace views {
19 class Widget; 20 class Widget;
20 } 21 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 void DetachFromWidget(views::Widget* widget); 102 void DetachFromWidget(views::Widget* widget);
102 103
103 CaptivePortalView* captive_portal_view_for_testing() { 104 CaptivePortalView* captive_portal_view_for_testing() {
104 return captive_portal_view_for_testing_; 105 return captive_portal_view_for_testing_;
105 } 106 }
106 107
107 // Not owned by this class. 108 // Not owned by this class.
108 Delegate* delegate_; 109 Delegate* delegate_;
109 // Not owned by this class. 110 // Not owned by this class.
110 views::Widget* widget_; 111 views::Widget* widget_;
111 scoped_ptr<CaptivePortalView> captive_portal_view_; 112 std::unique_ptr<CaptivePortalView> captive_portal_view_;
112 113
113 // Not owned by this class. 114 // Not owned by this class.
114 content::WebContents* web_contents_; 115 content::WebContents* web_contents_;
115 116
116 CaptivePortalView* captive_portal_view_for_testing_; 117 CaptivePortalView* captive_portal_view_for_testing_;
117 118
118 base::Time started_loading_at_; 119 base::Time started_loading_at_;
119 120
120 DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowProxy); 121 DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowProxy);
121 }; 122 };
122 123
123 } // namespace chromeos 124 } // namespace chromeos
124 125
125 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_ 126 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698