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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/public/cpp/shell_window_ids.h" 10 #include "ash/public/cpp/shell_window_ids.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_port.h"
12 #include "ash/system/tray/system_tray.h" 13 #include "ash/system/tray/system_tray.h"
13 #include "ash/wallpaper/wallpaper_controller.h" 14 #include "ash/wallpaper/wallpaper_controller.h"
14 #include "ash/wallpaper/wallpaper_delegate.h" 15 #include "ash/wallpaper/wallpaper_delegate.h"
15 #include "ash/wm_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"
24 #include "base/threading/thread_restrictions.h" 24 #include "base/threading/thread_restrictions.h"
25 #include "base/threading/thread_task_runner_handle.h" 25 #include "base/threading/thread_task_runner_handle.h"
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 552
553 void LoginDisplayHostImpl::BeforeSessionStart() { 553 void LoginDisplayHostImpl::BeforeSessionStart() {
554 session_starting_ = true; 554 session_starting_ = true;
555 } 555 }
556 556
557 void LoginDisplayHostImpl::Finalize() { 557 void LoginDisplayHostImpl::Finalize() {
558 DVLOG(1) << "Session starting"; 558 DVLOG(1) << "Session starting";
559 // When adding another user into the session, we defer the wallpaper's 559 // When adding another user into the session, we defer the wallpaper's
560 // animation in order to prevent the flashing of the previous user's windows. 560 // animation in order to prevent the flashing of the previous user's windows.
561 // See crbug.com/541864. 561 // See crbug.com/541864.
562 if (ash::WmShell::HasInstance() && 562 if (ash::ShellPort::HasInstance() &&
563 finalize_animation_type_ != ANIMATION_ADD_USER) { 563 finalize_animation_type_ != ANIMATION_ADD_USER) {
564 ash::Shell::Get()->wallpaper_controller()->MoveToUnlockedContainer(); 564 ash::Shell::Get()->wallpaper_controller()->MoveToUnlockedContainer();
565 } 565 }
566 566
567 switch (finalize_animation_type_) { 567 switch (finalize_animation_type_) {
568 case ANIMATION_NONE: 568 case ANIMATION_NONE:
569 ShutdownDisplayHost(false); 569 ShutdownDisplayHost(false);
570 break; 570 break;
571 case ANIMATION_WORKSPACE: 571 case ANIMATION_WORKSPACE:
572 if (ash::Shell::HasInstance()) 572 if (ash::Shell::HasInstance())
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
1484 // Chrome locale. Otherwise it will be lost if Chrome restarts. 1484 // Chrome locale. Otherwise it will be lost if Chrome restarts.
1485 // Don't need to schedule pref save because setting initial local 1485 // Don't need to schedule pref save because setting initial local
1486 // will enforce preference saving. 1486 // will enforce preference saving.
1487 prefs->SetString(prefs::kApplicationLocale, locale); 1487 prefs->SetString(prefs::kApplicationLocale, locale);
1488 StartupUtils::SetInitialLocale(locale); 1488 StartupUtils::SetInitialLocale(locale);
1489 1489
1490 TriggerShowLoginWizardFinish(locale, std::move(data)); 1490 TriggerShowLoginWizardFinish(locale, std::move(data));
1491 } 1491 }
1492 1492
1493 } // namespace chromeos 1493 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698