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

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

Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move CaptivePortalDetector to a component Created 6 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 | Annotate | Revision Log
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 void MakeSureScreenIsShown(); 104 void MakeSureScreenIsShown();
105 105
106 // Returns an instance of the error screen. 106 // Returns an instance of the error screen.
107 ErrorScreen* GetErrorScreen(); 107 ErrorScreen* GetErrorScreen();
108 108
109 void StartUpdateCheck(); 109 void StartUpdateCheck();
110 void ShowErrorMessage(); 110 void ShowErrorMessage();
111 void HideErrorMessage(); 111 void HideErrorMessage();
112 void UpdateErrorMessage( 112 void UpdateErrorMessage(
113 const NetworkState* network, 113 const NetworkState* network,
114 const NetworkPortalDetector::CaptivePortalStatus status); 114 const captive_portal::CaptivePortalStatus status);
115 // Timer for the interval to wait for the reboot. 115 // Timer for the interval to wait for the reboot.
116 // If reboot didn't happen - ask user to reboot manually. 116 // If reboot didn't happen - ask user to reboot manually.
117 base::OneShotTimer<UpdateScreen> reboot_timer_; 117 base::OneShotTimer<UpdateScreen> reboot_timer_;
118 118
119 // Returns a static InstanceSet. 119 // Returns a static InstanceSet.
120 typedef std::set<UpdateScreen*> InstanceSet; 120 typedef std::set<UpdateScreen*> InstanceSet;
121 static InstanceSet& GetInstanceSet(); 121 static InstanceSet& GetInstanceSet();
122 122
123 // Current state of the update screen. 123 // Current state of the update screen.
124 State state_; 124 State state_;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 bool is_first_portal_notification_; 163 bool is_first_portal_notification_;
164 164
165 base::WeakPtrFactory<UpdateScreen> weak_factory_; 165 base::WeakPtrFactory<UpdateScreen> weak_factory_;
166 166
167 DISALLOW_COPY_AND_ASSIGN(UpdateScreen); 167 DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
168 }; 168 };
169 169
170 } // namespace chromeos 170 } // namespace chromeos
171 171
172 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_ 172 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698