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

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

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 3 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/shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
11 #include "ash/common/wallpaper/wallpaper_delegate.h"
11 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
12 #include "ash/desktop_background/desktop_background_controller.h" 13 #include "ash/desktop_background/desktop_background_controller.h"
13 #include "ash/desktop_background/user_wallpaper_delegate.h"
14 #include "ash/public/interfaces/container.mojom.h" 14 #include "ash/public/interfaces/container.mojom.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "base/bind.h" 16 #include "base/bind.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/location.h" 18 #include "base/location.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "base/single_thread_task_runner.h" 21 #include "base/single_thread_task_runner.h"
22 #include "base/strings/string_split.h" 22 #include "base/strings/string_split.h"
23 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 } else { 854 } else {
855 NOTIMPLEMENTED(); 855 NOTIMPLEMENTED();
856 } 856 }
857 registrar_.Remove(this, 857 registrar_.Remove(this,
858 chrome::NOTIFICATION_LOGIN_USER_CHANGED, 858 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
859 content::NotificationService::AllSources()); 859 content::NotificationService::AllSources());
860 } else if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) { 860 } else if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) {
861 VLOG(1) << "Login WebUI >> wp animation done"; 861 VLOG(1) << "Login WebUI >> wp animation done";
862 is_wallpaper_loaded_ = true; 862 is_wallpaper_loaded_ = true;
863 if (!chrome::IsRunningInMash()) { 863 if (!chrome::IsRunningInMash()) {
864 ash::Shell::GetInstance() 864 ash::WmShell::Get()
865 ->user_wallpaper_delegate() 865 ->wallpaper_delegate()
866 ->OnWallpaperBootAnimationFinished(); 866 ->OnWallpaperBootAnimationFinished();
867 } else { 867 } else {
868 NOTIMPLEMENTED(); 868 NOTIMPLEMENTED();
869 } 869 }
870 if (waiting_for_wallpaper_load_) { 870 if (waiting_for_wallpaper_load_) {
871 // StartWizard / StartSignInScreen could be called multiple times through 871 // StartWizard / StartSignInScreen could be called multiple times through
872 // the lifetime of host. 872 // the lifetime of host.
873 // Make sure that subsequent calls are not postponed. 873 // Make sure that subsequent calls are not postponed.
874 waiting_for_wallpaper_load_ = false; 874 waiting_for_wallpaper_load_ = false;
875 if (initialize_webui_hidden_) 875 if (initialize_webui_hidden_)
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
1372 1372
1373 locale_util::SwitchLanguageCallback callback( 1373 locale_util::SwitchLanguageCallback callback(
1374 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); 1374 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
1375 1375
1376 // Load locale keyboards here. Hardware layout would be automatically enabled. 1376 // Load locale keyboards here. Hardware layout would be automatically enabled.
1377 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, 1377 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1378 callback, ProfileManager::GetActiveUserProfile()); 1378 callback, ProfileManager::GetActiveUserProfile());
1379 } 1379 }
1380 1380
1381 } // namespace chromeos 1381 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/background/ash_wallpaper_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698