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

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

Issue 2713553006: cros: Remove unused WizardController::Observer. (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/wallpaper/wallpaper_controller.h" 10 #include "ash/common/wallpaper/wallpaper_controller.h"
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 532
533 void LoginDisplayHostImpl::Finalize() { 533 void LoginDisplayHostImpl::Finalize() {
534 DVLOG(1) << "Session starting"; 534 DVLOG(1) << "Session starting";
535 // When adding another user into the session, we defer the wallpaper's 535 // When adding another user into the session, we defer the wallpaper's
536 // animation in order to prevent the flashing of the previous user's windows. 536 // animation in order to prevent the flashing of the previous user's windows.
537 // See crbug.com/541864. 537 // See crbug.com/541864.
538 if (ash::WmShell::HasInstance() && 538 if (ash::WmShell::HasInstance() &&
539 finalize_animation_type_ != ANIMATION_ADD_USER) { 539 finalize_animation_type_ != ANIMATION_ADD_USER) {
540 ash::WmShell::Get()->wallpaper_controller()->MoveToUnlockedContainer(); 540 ash::WmShell::Get()->wallpaper_controller()->MoveToUnlockedContainer();
541 } 541 }
542 if (wizard_controller_.get())
543 wizard_controller_->OnSessionStart();
544 542
545 switch (finalize_animation_type_) { 543 switch (finalize_animation_type_) {
546 case ANIMATION_NONE: 544 case ANIMATION_NONE:
547 ShutdownDisplayHost(false); 545 ShutdownDisplayHost(false);
548 break; 546 break;
549 case ANIMATION_WORKSPACE: 547 case ANIMATION_WORKSPACE:
550 if (ash::Shell::HasInstance()) 548 if (ash::Shell::HasInstance())
551 ScheduleWorkspaceAnimation(); 549 ScheduleWorkspaceAnimation();
552 550
553 ShutdownDisplayHost(false); 551 ShutdownDisplayHost(false);
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 // Chrome locale. Otherwise it will be lost if Chrome restarts. 1458 // Chrome locale. Otherwise it will be lost if Chrome restarts.
1461 // Don't need to schedule pref save because setting initial local 1459 // Don't need to schedule pref save because setting initial local
1462 // will enforce preference saving. 1460 // will enforce preference saving.
1463 prefs->SetString(prefs::kApplicationLocale, locale); 1461 prefs->SetString(prefs::kApplicationLocale, locale);
1464 StartupUtils::SetInitialLocale(locale); 1462 StartupUtils::SetInitialLocale(locale);
1465 1463
1466 TriggerShowLoginWizardFinish(locale, std::move(data)); 1464 TriggerShowLoginWizardFinish(locale, std::move(data));
1467 } 1465 }
1468 1466
1469 } // namespace chromeos 1467 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698