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

Side by Side Diff: chrome/browser/chromeos/login/screens/update_screen.h

Issue 2870203003: Make Hands-Off Zero-Touch Enrollment compatibile with tests (Closed)
Patch Set: Created 3 years, 7 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 void HideErrorMessage(); 118 void HideErrorMessage();
119 void UpdateErrorMessage( 119 void UpdateErrorMessage(
120 const NetworkState* network, 120 const NetworkState* network,
121 const NetworkPortalDetector::CaptivePortalStatus status); 121 const NetworkPortalDetector::CaptivePortalStatus status);
122 122
123 void DelayErrorMessage(); 123 void DelayErrorMessage();
124 124
125 // The user requested an attempt to connect to the network should be made. 125 // The user requested an attempt to connect to the network should be made.
126 void OnConnectRequested(); 126 void OnConnectRequested();
127 127
128 // Records the fact that we performed an update check and were notified that
129 // it was not necessary to perform the update.
130 void RecordUpdateCheckWithoutUpdate();
131
132 // Returns true if we recently performed an update check which did not lead
133 // to an update.
134 bool RecentUpdateCheckWithoutUpdate();
xiyuan 2017/05/09 22:03:52 nit: RecentUpdateCheckWithoutUpdate -> ShouldCheck
kumarniranjan 2017/05/09 22:49:47 Done.
135
128 // Timer for the interval to wait for the reboot. 136 // Timer for the interval to wait for the reboot.
129 // If reboot didn't happen - ask user to reboot manually. 137 // If reboot didn't happen - ask user to reboot manually.
130 base::OneShotTimer reboot_timer_; 138 base::OneShotTimer reboot_timer_;
131 139
132 // Returns a static InstanceSet. 140 // Returns a static InstanceSet.
133 // TODO(jdufault): There should only ever be one instance of this class. 141 // TODO(jdufault): There should only ever be one instance of this class.
134 // Remove support for supporting multiple instances. See crbug.com/672142. 142 // Remove support for supporting multiple instances. See crbug.com/672142.
135 typedef std::set<UpdateScreen*> InstanceSet; 143 typedef std::set<UpdateScreen*> InstanceSet;
136 static InstanceSet& GetInstanceSet(); 144 static InstanceSet& GetInstanceSet();
137 145
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_; 197 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_;
190 198
191 base::WeakPtrFactory<UpdateScreen> weak_factory_; 199 base::WeakPtrFactory<UpdateScreen> weak_factory_;
192 200
193 DISALLOW_COPY_AND_ASSIGN(UpdateScreen); 201 DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
194 }; 202 };
195 203
196 } // namespace chromeos 204 } // namespace chromeos
197 205
198 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 206 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698