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

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

Issue 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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/launcher/launcher_context_menu_unittest.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/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/wm/mru_window_tracker.h" 8 #include "ash/common/wm/mru_window_tracker.h"
9 #include "ash/common/wm/window_positioner.h" 9 #include "ash/common/wm/window_positioner.h"
10 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 UserSwitchAnimatorChromeOS::UserSwitchAnimatorChromeOS( 106 UserSwitchAnimatorChromeOS::UserSwitchAnimatorChromeOS(
107 MultiUserWindowManagerChromeOS* owner, 107 MultiUserWindowManagerChromeOS* owner,
108 const AccountId& new_account_id, 108 const AccountId& new_account_id,
109 int animation_speed_ms) 109 int animation_speed_ms)
110 : owner_(owner), 110 : owner_(owner),
111 new_account_id_(new_account_id), 111 new_account_id_(new_account_id),
112 animation_speed_ms_(animation_speed_ms), 112 animation_speed_ms_(animation_speed_ms),
113 animation_step_(ANIMATION_STEP_HIDE_OLD_USER), 113 animation_step_(ANIMATION_STEP_HIDE_OLD_USER),
114 screen_cover_(GetScreenCover(NULL)), 114 screen_cover_(GetScreenCover(NULL)),
115 windows_by_account_id_() { 115 windows_by_account_id_() {
116 ash::Shell::GetInstance()->DismissAppList(); 116 ash::WmShell::Get()->DismissAppList();
117 BuildUserToWindowsListMap(); 117 BuildUserToWindowsListMap();
118 AdvanceUserTransitionAnimation(); 118 AdvanceUserTransitionAnimation();
119 119
120 if (!animation_speed_ms_) { 120 if (!animation_speed_ms_) {
121 FinalizeAnimation(); 121 FinalizeAnimation();
122 } else { 122 } else {
123 user_changed_animation_timer_.reset(new base::Timer( 123 user_changed_animation_timer_.reset(new base::Timer(
124 FROM_HERE, 124 FROM_HERE,
125 base::TimeDelta::FromMilliseconds(animation_speed_ms_), 125 base::TimeDelta::FromMilliseconds(animation_speed_ms_),
126 base::Bind( 126 base::Bind(
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 if (itr != window_to_entry_map.end()) { 433 if (itr != window_to_entry_map.end()) {
434 windows_by_account_id_[itr->second->show_for_user()].push_back( 434 windows_by_account_id_[itr->second->show_for_user()].push_back(
435 child_window); 435 child_window);
436 } 436 }
437 } 437 }
438 } 438 }
439 } 439 }
440 } 440 }
441 441
442 } // namespace chrome 442 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698