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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.h

Issue 22264004: Remove ConnectivityStateHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove redundant IsConnected() check Created 7 years, 4 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_EXISTING_USER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 14 matching lines...) Expand all
25 #include "content/public/browser/notification_observer.h" 25 #include "content/public/browser/notification_observer.h"
26 #include "content/public/browser/notification_registrar.h" 26 #include "content/public/browser/notification_registrar.h"
27 #include "ui/gfx/rect.h" 27 #include "ui/gfx/rect.h"
28 #include "url/gurl.h" 28 #include "url/gurl.h"
29 29
30 namespace chromeos { 30 namespace chromeos {
31 31
32 class CrosSettings; 32 class CrosSettings;
33 class LoginDisplayHost; 33 class LoginDisplayHost;
34 34
35 namespace login {
36 class NetworkStateHelper;
37 }
38
35 // ExistingUserController is used to handle login when someone has 39 // ExistingUserController is used to handle login when someone has
36 // already logged into the machine. 40 // already logged into the machine.
37 // To use ExistingUserController create an instance of it and invoke Init. 41 // To use ExistingUserController create an instance of it and invoke Init.
38 // When Init is called it creates LoginDisplay instance which encapsulates 42 // When Init is called it creates LoginDisplay instance which encapsulates
39 // all login UI implementation. 43 // all login UI implementation.
40 // ExistingUserController maintains it's own life cycle and deletes itself when 44 // ExistingUserController maintains it's own life cycle and deletes itself when
41 // the user logs in (or chooses to see other settings). 45 // the user logs in (or chooses to see other settings).
42 class ExistingUserController : public LoginDisplay::Delegate, 46 class ExistingUserController : public LoginDisplay::Delegate,
43 public content::NotificationObserver, 47 public content::NotificationObserver,
44 public LoginPerformer::Delegate, 48 public LoginPerformer::Delegate,
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 // Callback to invoke to resume login, after auto-enrollment has completed. 293 // Callback to invoke to resume login, after auto-enrollment has completed.
290 base::Closure resume_login_callback_; 294 base::Closure resume_login_callback_;
291 295
292 // Time when the signin screen was first displayed. Used to measure the time 296 // Time when the signin screen was first displayed. Used to measure the time
293 // from showing the screen until a successful login is performed. 297 // from showing the screen until a successful login is performed.
294 base::Time time_init_; 298 base::Time time_init_;
295 299
296 // Timer for the interval to wait for the reboot after TPM error UI was shown. 300 // Timer for the interval to wait for the reboot after TPM error UI was shown.
297 base::OneShotTimer<ExistingUserController> reboot_timer_; 301 base::OneShotTimer<ExistingUserController> reboot_timer_;
298 302
303 scoped_ptr<login::NetworkStateHelper> network_state_helper_;
304
299 FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin); 305 FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin);
300 306
301 DISALLOW_COPY_AND_ASSIGN(ExistingUserController); 307 DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
302 }; 308 };
303 309
304 } // namespace chromeos 310 } // namespace chromeos
305 311
306 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 312 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/captive_portal_view.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698