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

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

Issue 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)
Patch Set: feedback 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
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/system/tray/system_tray.h" 10 #include "ash/common/system/tray/system_tray.h"
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 } else { 956 } else {
957 NOTIMPLEMENTED(); 957 NOTIMPLEMENTED();
958 } 958 }
959 registrar_.Remove(this, 959 registrar_.Remove(this,
960 chrome::NOTIFICATION_LOGIN_USER_CHANGED, 960 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
961 content::NotificationService::AllSources()); 961 content::NotificationService::AllSources());
962 } else if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) { 962 } else if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) {
963 VLOG(1) << "Login WebUI >> wp animation done"; 963 VLOG(1) << "Login WebUI >> wp animation done";
964 is_wallpaper_loaded_ = true; 964 is_wallpaper_loaded_ = true;
965 if (!ash_util::IsRunningInMash()) { 965 if (!ash_util::IsRunningInMash()) {
966 ash::WmShell::Get() 966 ash::Shell::Get()
967 ->wallpaper_delegate() 967 ->wallpaper_delegate()
968 ->OnWallpaperBootAnimationFinished(); 968 ->OnWallpaperBootAnimationFinished();
969 } else { 969 } else {
970 NOTIMPLEMENTED(); 970 NOTIMPLEMENTED();
971 } 971 }
972 if (waiting_for_wallpaper_load_) { 972 if (waiting_for_wallpaper_load_) {
973 // StartWizard / StartSignInScreen could be called multiple times through 973 // StartWizard / StartSignInScreen could be called multiple times through
974 // the lifetime of host. 974 // the lifetime of host.
975 // Make sure that subsequent calls are not postponed. 975 // Make sure that subsequent calls are not postponed.
976 waiting_for_wallpaper_load_ = false; 976 waiting_for_wallpaper_load_ = false;
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1488 // Chrome locale. Otherwise it will be lost if Chrome restarts. 1488 // Chrome locale. Otherwise it will be lost if Chrome restarts.
1489 // Don't need to schedule pref save because setting initial local 1489 // Don't need to schedule pref save because setting initial local
1490 // will enforce preference saving. 1490 // will enforce preference saving.
1491 prefs->SetString(prefs::kApplicationLocale, locale); 1491 prefs->SetString(prefs::kApplicationLocale, locale);
1492 StartupUtils::SetInitialLocale(locale); 1492 StartupUtils::SetInitialLocale(locale);
1493 1493
1494 TriggerShowLoginWizardFinish(locale, std::move(data)); 1494 TriggerShowLoginWizardFinish(locale, std::move(data));
1495 } 1495 }
1496 1496
1497 } // namespace chromeos 1497 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698