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

Side by Side Diff: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete 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 | « chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc ('k') | no next file » | 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/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/common/shelf/shelf_layout_manager.h" 7 #include "ash/common/shelf/shelf_layout_manager.h"
8 #include "ash/common/shelf/shelf_widget.h" 8 #include "ash/common/shelf/shelf_widget.h"
9 #include "ash/common/shelf/wm_shelf.h" 9 #include "ash/common/shelf/wm_shelf.h"
10 #include "ash/common/wallpaper/wallpaper_delegate.h" 10 #include "ash/common/wallpaper/wallpaper_delegate.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 UserSwitchAnimatorChromeOS::UserSwitchAnimatorChromeOS( 108 UserSwitchAnimatorChromeOS::UserSwitchAnimatorChromeOS(
109 MultiUserWindowManagerChromeOS* owner, 109 MultiUserWindowManagerChromeOS* owner,
110 const AccountId& new_account_id, 110 const AccountId& new_account_id,
111 int animation_speed_ms) 111 int animation_speed_ms)
112 : owner_(owner), 112 : owner_(owner),
113 new_account_id_(new_account_id), 113 new_account_id_(new_account_id),
114 animation_speed_ms_(animation_speed_ms), 114 animation_speed_ms_(animation_speed_ms),
115 animation_step_(ANIMATION_STEP_HIDE_OLD_USER), 115 animation_step_(ANIMATION_STEP_HIDE_OLD_USER),
116 screen_cover_(GetScreenCover(NULL)), 116 screen_cover_(GetScreenCover(NULL)),
117 windows_by_account_id_() { 117 windows_by_account_id_() {
118 ash::WmShell::Get()->DismissAppList(); 118 ash::Shell::Get()->DismissAppList();
119 BuildUserToWindowsListMap(); 119 BuildUserToWindowsListMap();
120 AdvanceUserTransitionAnimation(); 120 AdvanceUserTransitionAnimation();
121 121
122 if (!animation_speed_ms_) { 122 if (!animation_speed_ms_) {
123 FinalizeAnimation(); 123 FinalizeAnimation();
124 } else { 124 } else {
125 user_changed_animation_timer_.reset(new base::Timer( 125 user_changed_animation_timer_.reset(new base::Timer(
126 FROM_HERE, 126 FROM_HERE,
127 base::TimeDelta::FromMilliseconds(animation_speed_ms_), 127 base::TimeDelta::FromMilliseconds(animation_speed_ms_),
128 base::Bind( 128 base::Bind(
(...skipping 306 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
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698