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

Side by Side Diff: ash/root_window_controller.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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 | « ash/magnifier/magnification_controller.cc ('k') | ash/shelf/overflow_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h"
11 #include "ash/aura/aura_layout_manager_adapter.h" 10 #include "ash/aura/aura_layout_manager_adapter.h"
12 #include "ash/aura/wm_shelf_aura.h" 11 #include "ash/aura/wm_shelf_aura.h"
13 #include "ash/aura/wm_window_aura.h" 12 #include "ash/aura/wm_window_aura.h"
14 #include "ash/common/ash_constants.h" 13 #include "ash/common/ash_constants.h"
14 #include "ash/common/ash_switches.h"
15 #include "ash/common/focus_cycler.h" 15 #include "ash/common/focus_cycler.h"
16 #include "ash/common/root_window_controller_common.h" 16 #include "ash/common/root_window_controller_common.h"
17 #include "ash/common/session/session_state_delegate.h" 17 #include "ash/common/session/session_state_delegate.h"
18 #include "ash/common/shelf/shelf_types.h" 18 #include "ash/common/shelf/shelf_types.h"
19 #include "ash/common/shell_window_ids.h" 19 #include "ash/common/shell_window_ids.h"
20 #include "ash/common/system/tray/system_tray_delegate.h" 20 #include "ash/common/system/tray/system_tray_delegate.h"
21 #include "ash/common/wm/always_on_top_controller.h" 21 #include "ash/common/wm/always_on_top_controller.h"
22 #include "ash/common/wm/container_finder.h" 22 #include "ash/common/wm/container_finder.h"
23 #include "ash/common/wm/dock/docked_window_layout_manager.h" 23 #include "ash/common/wm/dock/docked_window_layout_manager.h"
24 #include "ash/common/wm/fullscreen_window_finder.h" 24 #include "ash/common/wm/fullscreen_window_finder.h"
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 aura::Window* primary_root_window = Shell::GetInstance() 886 aura::Window* primary_root_window = Shell::GetInstance()
887 ->window_tree_host_manager() 887 ->window_tree_host_manager()
888 ->GetPrimaryRootWindow(); 888 ->GetPrimaryRootWindow();
889 return GetRootWindowSettings(primary_root_window)->controller; 889 return GetRootWindowSettings(primary_root_window)->controller;
890 } 890 }
891 891
892 return GetRootWindowSettings(root_window)->controller; 892 return GetRootWindowSettings(root_window)->controller;
893 } 893 }
894 894
895 } // namespace ash 895 } // namespace ash
OLDNEW
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/shelf/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698