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

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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
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/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 const std::string& first_screen_name, 513 const std::string& first_screen_name,
514 scoped_ptr<base::DictionaryValue> screen_parameters) { 514 scoped_ptr<base::DictionaryValue> screen_parameters) {
515 if (login::LoginScrollIntoViewEnabled()) 515 if (login::LoginScrollIntoViewEnabled())
516 DisableKeyboardOverscroll(); 516 DisableKeyboardOverscroll();
517 517
518 startup_sound_honors_spoken_feedback_ = false; 518 startup_sound_honors_spoken_feedback_ = false;
519 TryToPlayStartupSound(); 519 TryToPlayStartupSound();
520 520
521 // Keep parameters to restore if renderer crashes. 521 // Keep parameters to restore if renderer crashes.
522 restore_path_ = RESTORE_WIZARD; 522 restore_path_ = RESTORE_WIZARD;
523 wizard_first_screen_name_ = first_screen_name; 523 first_screen_name_ = first_screen_name;
524 if (screen_parameters.get()) 524 if (screen_parameters.get())
525 wizard_screen_parameters_.reset(screen_parameters->DeepCopy()); 525 screen_parameters_.reset(screen_parameters->DeepCopy());
526 else 526 else
527 wizard_screen_parameters_.reset(); 527 screen_parameters_.reset();
528 is_showing_login_ = false; 528 is_showing_login_ = false;
529 529
530 if (waiting_for_wallpaper_load_ && !initialize_webui_hidden_) { 530 if (waiting_for_wallpaper_load_ && !initialize_webui_hidden_) {
531 VLOG(1) << "Login WebUI >> wizard postponed"; 531 VLOG(1) << "Login WebUI >> wizard postponed";
532 return; 532 return;
533 } 533 }
534 VLOG(1) << "Login WebUI >> wizard"; 534 VLOG(1) << "Login WebUI >> wizard";
535 535
536 if (!login_window_) 536 if (!login_window_)
537 LoadURL(GURL(kOobeURL)); 537 LoadURL(GURL(kOobeURL));
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 // Wallpaper has finished loading before StartWizard/StartSignInScreen has 1018 // Wallpaper has finished loading before StartWizard/StartSignInScreen has
1019 // been called. In general this should not happen. 1019 // been called. In general this should not happen.
1020 // Let go through normal code path when one of those will be called. 1020 // Let go through normal code path when one of those will be called.
1021 if (restore_path_ == RESTORE_UNKNOWN) { 1021 if (restore_path_ == RESTORE_UNKNOWN) {
1022 NOTREACHED(); 1022 NOTREACHED();
1023 return; 1023 return;
1024 } 1024 }
1025 1025
1026 switch (restore_path_) { 1026 switch (restore_path_) {
1027 case RESTORE_WIZARD: 1027 case RESTORE_WIZARD:
1028 StartWizard(wizard_first_screen_name_, 1028 StartWizard(first_screen_name_, screen_parameters_.Pass());
1029 wizard_screen_parameters_.Pass());
1030 break; 1029 break;
1031 case RESTORE_SIGN_IN: 1030 case RESTORE_SIGN_IN:
1032 StartSignInScreen(LoginScreenContext()); 1031 StartSignInScreen(LoginScreenContext());
1033 break; 1032 break;
1034 case RESTORE_ADD_USER_INTO_SESSION: 1033 case RESTORE_ADD_USER_INTO_SESSION:
1035 StartUserAdding(completion_callback_); 1034 StartUserAdding(completion_callback_);
1036 break; 1035 break;
1037 default: 1036 default:
1038 NOTREACHED(); 1037 NOTREACHED();
1039 break; 1038 break;
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1296 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1295 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1297 new locale_util::SwitchLanguageCallback( 1296 new locale_util::SwitchLanguageCallback(
1298 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1297 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1299 1298
1300 // Load locale keyboards here. Hardware layout would be automatically enabled. 1299 // Load locale keyboards here. Hardware layout would be automatically enabled.
1301 locale_util::SwitchLanguage( 1300 locale_util::SwitchLanguage(
1302 locale, true, true /* login_layouts_only */, callback.Pass()); 1301 locale, true, true /* login_layouts_only */, callback.Pass());
1303 } 1302 }
1304 1303
1305 } // namespace chromeos 1304 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698