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

Side by Side Diff: ash/root_window_controller.cc

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/root_window_controller_unittest.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 <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/desktop_background/desktop_background_widget_controller.h" 10 #include "ash/desktop_background/desktop_background_widget_controller.h"
11 #include "ash/display/display_controller.h" 11 #include "ash/display/display_controller.h"
12 #include "ash/display/multi_display_manager.h" 12 #include "ash/display/display_manager.h"
13 #include "ash/focus_cycler.h" 13 #include "ash/focus_cycler.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "ash/shell_delegate.h" 15 #include "ash/shell_delegate.h"
16 #include "ash/shell_factory.h" 16 #include "ash/shell_factory.h"
17 #include "ash/shell_window_ids.h" 17 #include "ash/shell_window_ids.h"
18 #include "ash/system/status_area_widget.h" 18 #include "ash/system/status_area_widget.h"
19 #include "ash/system/tray/system_tray_delegate.h" 19 #include "ash/system/tray/system_tray_delegate.h"
20 #include "ash/wm/base_layout_manager.h" 20 #include "ash/wm/base_layout_manager.h"
21 #include "ash/wm/boot_splash_screen.h" 21 #include "ash/wm/boot_splash_screen.h"
22 #include "ash/wm/panel_layout_manager.h" 22 #include "ash/wm/panel_layout_manager.h"
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 "OverlayContainer", 646 "OverlayContainer",
647 lock_screen_related_containers); 647 lock_screen_related_containers);
648 SetUsesScreenCoordinates(overlay_container); 648 SetUsesScreenCoordinates(overlay_container);
649 649
650 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 650 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
651 "PowerButtonAnimationContainer", root_window) ; 651 "PowerButtonAnimationContainer", root_window) ;
652 } 652 }
653 653
654 } // namespace internal 654 } // namespace internal
655 } // namespace ash 655 } // namespace ash
OLDNEW
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698