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

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

Issue 2952083002: Remove unnecessary logic from UpdateScreen (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/update_screen.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 void HideErrorMessage(); 119 void HideErrorMessage();
120 void UpdateErrorMessage( 120 void UpdateErrorMessage(
121 const NetworkState* network, 121 const NetworkState* network,
122 const NetworkPortalDetector::CaptivePortalStatus status); 122 const NetworkPortalDetector::CaptivePortalStatus status);
123 123
124 void DelayErrorMessage(); 124 void DelayErrorMessage();
125 125
126 // The user requested an attempt to connect to the network should be made. 126 // The user requested an attempt to connect to the network should be made.
127 void OnConnectRequested(); 127 void OnConnectRequested();
128 128
129 // Records the fact that we performed an update check but do not yet
130 // know if this update check is going to result in an update.
131 void RecordUpdateCheckWithNoUpdateYet();
132
133 // When an update is found, this is called to clear the time of update check
134 // which had saved when we did not yet know whether it would result in an
135 // update.
136 void ClearUpdateCheckNoUpdateTime();
137
138 // Returns true if we should check for an update.
139 bool ShouldCheckForUpdate();
140
141 // Timer for the interval to wait for the reboot. 129 // Timer for the interval to wait for the reboot.
142 // If reboot didn't happen - ask user to reboot manually. 130 // If reboot didn't happen - ask user to reboot manually.
143 base::OneShotTimer reboot_timer_; 131 base::OneShotTimer reboot_timer_;
144 132
145 // Returns a static InstanceSet. 133 // Returns a static InstanceSet.
146 // TODO(jdufault): There should only ever be one instance of this class. 134 // TODO(jdufault): There should only ever be one instance of this class.
147 // Remove support for supporting multiple instances. See crbug.com/672142. 135 // Remove support for supporting multiple instances. See crbug.com/672142.
148 typedef std::set<UpdateScreen*> InstanceSet; 136 typedef std::set<UpdateScreen*> InstanceSet;
149 static InstanceSet& GetInstanceSet(); 137 static InstanceSet& GetInstanceSet();
150 138
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_; 190 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_;
203 191
204 base::WeakPtrFactory<UpdateScreen> weak_factory_; 192 base::WeakPtrFactory<UpdateScreen> weak_factory_;
205 193
206 DISALLOW_COPY_AND_ASSIGN(UpdateScreen); 194 DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
207 }; 195 };
208 196
209 } // namespace chromeos 197 } // namespace chromeos
210 198
211 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 199 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/update_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698