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

Side by Side Diff: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.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/ui/ash/multi_user/user_switch_animator_chromeos.h" 5 #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shelf/shelf_widget.h" 9 #include "ash/shelf/shelf_widget.h"
10 #include "ash/shelf/wm_shelf.h" 10 #include "ash/shelf/wm_shelf.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_port.h"
12 #include "ash/wallpaper/wallpaper_delegate.h" 13 #include "ash/wallpaper/wallpaper_delegate.h"
13 #include "ash/wm/mru_window_tracker.h" 14 #include "ash/wm/mru_window_tracker.h"
14 #include "ash/wm/window_positioner.h" 15 #include "ash/wm/window_positioner.h"
15 #include "ash/wm/window_state.h" 16 #include "ash/wm/window_state.h"
16 #include "ash/wm/window_state_aura.h" 17 #include "ash/wm/window_state_aura.h"
17 #include "ash/wm/window_util.h" 18 #include "ash/wm/window_util.h"
18 #include "ash/wm_shell.h"
19 #include "ash/wm_window.h" 19 #include "ash/wm_window.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 21 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
23 #include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chrom eos.h" 23 #include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chrom eos.h"
24 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" 24 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
25 #include "ui/compositor/layer_animation_observer.h" 25 #include "ui/compositor/layer_animation_observer.h"
26 #include "ui/compositor/layer_tree_owner.h" 26 #include "ui/compositor/layer_tree_owner.h"
27 #include "ui/display/display.h" 27 #include "ui/display/display.h"
28 #include "ui/wm/core/window_util.h" 28 #include "ui/wm/core/window_util.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 ChromeLauncherController::instance(); 224 ChromeLauncherController::instance();
225 // The shelf animation duration override. 225 // The shelf animation duration override.
226 int duration_override = animation_speed_ms_; 226 int duration_override = animation_speed_ms_;
227 // Handle the shelf order of items. This is done once the old user is hidden. 227 // Handle the shelf order of items. This is done once the old user is hidden.
228 if (animation_step == ANIMATION_STEP_SHOW_NEW_USER) { 228 if (animation_step == ANIMATION_STEP_SHOW_NEW_USER) {
229 // Some unit tests have no ChromeLauncherController. 229 // Some unit tests have no ChromeLauncherController.
230 if (chrome_launcher_controller) 230 if (chrome_launcher_controller)
231 chrome_launcher_controller->ActiveUserChanged( 231 chrome_launcher_controller->ActiveUserChanged(
232 new_account_id_.GetUserEmail()); 232 new_account_id_.GetUserEmail());
233 // Hide the black rectangle on top of each shelf again. 233 // Hide the black rectangle on top of each shelf again.
234 for (ash::WmWindow* window : ash::WmShell::Get()->GetAllRootWindows()) { 234 for (ash::WmWindow* window : ash::ShellPort::Get()->GetAllRootWindows()) {
235 ash::ShelfWidget* shelf = ash::WmShelf::ForWindow(window)->shelf_widget(); 235 ash::ShelfWidget* shelf = ash::WmShelf::ForWindow(window)->shelf_widget();
236 shelf->HideShelfBehindBlackBar(false, duration_override); 236 shelf->HideShelfBehindBlackBar(false, duration_override);
237 } 237 }
238 // We kicked off the shelf animation above and the override can be 238 // We kicked off the shelf animation above and the override can be
239 // removed. 239 // removed.
240 duration_override = 0; 240 duration_override = 0;
241 } 241 }
242 242
243 if (!animation_speed_ms_ || animation_step == ANIMATION_STEP_FINALIZE) 243 if (!animation_speed_ms_ || animation_step == ANIMATION_STEP_FINALIZE)
244 return; 244 return;
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 if (itr != window_to_entry_map.end()) { 435 if (itr != window_to_entry_map.end()) {
436 windows_by_account_id_[itr->second->show_for_user()].push_back( 436 windows_by_account_id_[itr->second->show_for_user()].push_back(
437 child_window); 437 child_window);
438 } 438 }
439 } 439 }
440 } 440 }
441 } 441 }
442 } 442 }
443 443
444 } // namespace chrome 444 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698