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

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/lock/webui_screen_locker.cc

Issue 319633005: Revert 275492 "ChromeOS login webui refactoring : Simplify login..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/lock_state_controller.h" 8 #include "ash/wm/lock_state_controller.h"
9 #include "ash/wm/lock_state_observer.h" 9 #include "ash/wm/lock_state_observer.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 base::string16 WebUIScreenLocker::GetConnectedNetworkName() { 236 base::string16 WebUIScreenLocker::GetConnectedNetworkName() {
237 return network_state_helper_->GetCurrentNetworkName(); 237 return network_state_helper_->GetCurrentNetworkName();
238 } 238 }
239 239
240 bool WebUIScreenLocker::IsSigninInProgress() const { 240 bool WebUIScreenLocker::IsSigninInProgress() const {
241 // The way how screen locker is implemented right now there's no 241 // The way how screen locker is implemented right now there's no
242 // GAIA sign in in progress in any case. 242 // GAIA sign in in progress in any case.
243 return false; 243 return false;
244 } 244 }
245 245
246 void WebUIScreenLocker::Login(const UserContext& user_context, 246 void WebUIScreenLocker::Login(const UserContext& user_context) {
247 const SigninSpecifics& specifics) {
248 chromeos::ScreenLocker::default_screen_locker()->Authenticate(user_context); 247 chromeos::ScreenLocker::default_screen_locker()->Authenticate(user_context);
249 } 248 }
250 249
250 void WebUIScreenLocker::LoginAsRetailModeUser() {
251 NOTREACHED();
252 }
253
254 void WebUIScreenLocker::LoginAsGuest() {
255 NOTREACHED();
256 }
257
251 void WebUIScreenLocker::MigrateUserData(const std::string& old_password) { 258 void WebUIScreenLocker::MigrateUserData(const std::string& old_password) {
252 NOTREACHED(); 259 NOTREACHED();
253 } 260 }
254 261
262 void WebUIScreenLocker::LoginAsPublicAccount(const std::string& username) {
263 NOTREACHED();
264 }
265
255 void WebUIScreenLocker::OnSigninScreenReady() { 266 void WebUIScreenLocker::OnSigninScreenReady() {
256 } 267 }
257 268
269 void WebUIScreenLocker::OnUserSelected(const std::string& username) {
270 }
271
258 void WebUIScreenLocker::OnStartEnterpriseEnrollment() { 272 void WebUIScreenLocker::OnStartEnterpriseEnrollment() {
259 NOTREACHED(); 273 NOTREACHED();
260 } 274 }
261 275
262 void WebUIScreenLocker::OnStartKioskEnableScreen() { 276 void WebUIScreenLocker::OnStartKioskEnableScreen() {
263 NOTREACHED(); 277 NOTREACHED();
264 } 278 }
265 279
266 void WebUIScreenLocker::OnStartKioskAutolaunchScreen() { 280 void WebUIScreenLocker::OnStartKioskAutolaunchScreen() {
267 NOTREACHED(); 281 NOTREACHED();
(...skipping 11 matching lines...) Expand all
279 } 293 }
280 294
281 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) { 295 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) {
282 NOTREACHED(); 296 NOTREACHED();
283 } 297 }
284 298
285 void WebUIScreenLocker::Signout() { 299 void WebUIScreenLocker::Signout() {
286 chromeos::ScreenLocker::default_screen_locker()->Signout(); 300 chromeos::ScreenLocker::default_screen_locker()->Signout();
287 } 301 }
288 302
303 void WebUIScreenLocker::LoginAsKioskApp(const std::string& app_id,
304 bool diagnostic_mode) {
305 NOTREACHED();
306 }
307
289 //////////////////////////////////////////////////////////////////////////////// 308 ////////////////////////////////////////////////////////////////////////////////
290 // LockWindow::Observer implementation: 309 // LockWindow::Observer implementation:
291 310
292 void WebUIScreenLocker::OnLockWindowReady() { 311 void WebUIScreenLocker::OnLockWindowReady() {
293 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not"); 312 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not");
294 lock_ready_ = true; 313 lock_ready_ = true;
295 if (webui_ready_) 314 if (webui_ready_)
296 ScreenLockReady(); 315 ScreenLockReady();
297 } 316 }
298 317
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false); 397 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
379 if (login::LockScrollIntoViewEnabled()) 398 if (login::LockScrollIntoViewEnabled())
380 GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(true, new_bounds); 399 GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(true, new_bounds);
381 } 400 }
382 } 401 }
383 402
384 keyboard_bounds_ = new_bounds; 403 keyboard_bounds_ = new_bounds;
385 } 404 }
386 405
387 } // namespace chromeos 406 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698