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

Side by Side Diff: chrome/browser/chromeos/login/screens/update_screen.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 (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_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 double download_average_speed_; 170 double download_average_speed_;
171 171
172 // True if there was no notification from NetworkPortalDetector 172 // True if there was no notification from NetworkPortalDetector
173 // about state for the default network. 173 // about state for the default network.
174 bool is_first_detection_notification_; 174 bool is_first_detection_notification_;
175 175
176 // True if there was no notification about captive portal state for 176 // True if there was no notification about captive portal state for
177 // the default network. 177 // the default network.
178 bool is_first_portal_notification_; 178 bool is_first_portal_notification_;
179 179
180 scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_; 180 std::unique_ptr<ErrorScreensHistogramHelper> histogram_helper_;
181 181
182 // Timer for the captive portal detector to show portal login page. 182 // Timer for the captive portal detector to show portal login page.
183 // If redirect did not happen during this delay, error message is shown 183 // If redirect did not happen during this delay, error message is shown
184 // instead. 184 // instead.
185 base::OneShotTimer error_message_timer_; 185 base::OneShotTimer error_message_timer_;
186 186
187 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_; 187 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_;
188 188
189 base::WeakPtrFactory<UpdateScreen> weak_factory_; 189 base::WeakPtrFactory<UpdateScreen> weak_factory_;
190 190
191 DISALLOW_COPY_AND_ASSIGN(UpdateScreen); 191 DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
192 }; 192 };
193 193
194 } // namespace chromeos 194 } // namespace chromeos
195 195
196 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 196 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698