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

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

Issue 22264004: Remove ConnectivityStateHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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_WEBUI_SCREEN_LOCKER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/wm/lock_state_observer.h" 10 #include "ash/wm/lock_state_observer.h"
(...skipping 15 matching lines...) Expand all
26 namespace content { 26 namespace content {
27 class WebUI; 27 class WebUI;
28 } 28 }
29 29
30 namespace chromeos { 30 namespace chromeos {
31 31
32 class ScreenLocker; 32 class ScreenLocker;
33 class WebUILoginDisplay; 33 class WebUILoginDisplay;
34 struct UserContext; 34 struct UserContext;
35 35
36 namespace login {
37 class NetworkStateHelper;
38 } // namespace login
stevenjb 2013/08/07 01:43:27 nit: trailing comment not necessary and usually om
gauravsh 2013/08/07 17:28:19 Done.
39
36 namespace test { 40 namespace test {
37 class WebUIScreenLockerTester; 41 class WebUIScreenLockerTester;
38 } 42 }
39 43
40 // This version of ScreenLockerDelegate displays a WebUI lock screen based on 44 // This version of ScreenLockerDelegate displays a WebUI lock screen based on
41 // the Oobe account picker screen. 45 // the Oobe account picker screen.
42 class WebUIScreenLocker : public WebUILoginView, 46 class WebUIScreenLocker : public WebUILoginView,
43 public LoginDisplay::Delegate, 47 public LoginDisplay::Delegate,
44 public ScreenLockerDelegate, 48 public ScreenLockerDelegate,
45 public LockWindow::Observer, 49 public LockWindow::Observer,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 132
129 // Tracks when the lock window is displayed and ready. 133 // Tracks when the lock window is displayed and ready.
130 bool lock_ready_; 134 bool lock_ready_;
131 135
132 // Tracks when the WebUI finishes loading. 136 // Tracks when the WebUI finishes loading.
133 bool webui_ready_; 137 bool webui_ready_;
134 138
135 // Time when lock was initiated, required for metrics. 139 // Time when lock was initiated, required for metrics.
136 base::TimeTicks lock_time_; 140 base::TimeTicks lock_time_;
137 141
142 scoped_ptr<login::NetworkStateHelper> network_state_helper_;
143
138 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_; 144 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;
139 145
140 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker); 146 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);
141 }; 147 };
142 148
143 } // namespace chromeos 149 } // namespace chromeos
144 150
145 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_ 151 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698