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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: 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
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/wallpaper/wallpaper_delegate.h"
8 #include "ash/common/wm_shell.h"
9 #include "ash/common/wm_window.h"
7 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_layout_manager.h" 11 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shelf/shelf_widget.h" 12 #include "ash/shelf/shelf_widget.h"
10 #include "ash/shelf/wm_shelf.h" 13 #include "ash/shelf/wm_shelf.h"
11 #include "ash/shell.h" 14 #include "ash/shell.h"
12 #include "ash/wallpaper/wallpaper_delegate.h"
13 #include "ash/wm/mru_window_tracker.h" 15 #include "ash/wm/mru_window_tracker.h"
14 #include "ash/wm/window_positioner.h" 16 #include "ash/wm/window_positioner.h"
15 #include "ash/wm/window_state.h" 17 #include "ash/wm/window_state.h"
16 #include "ash/wm/window_state_aura.h" 18 #include "ash/wm/window_state_aura.h"
17 #include "ash/wm/window_util.h" 19 #include "ash/wm/window_util.h"
18 #include "ash/wm_shell.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"
29 #include "ui/wm/public/activation_client.h" 29 #include "ui/wm/public/activation_client.h"
(...skipping 405 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