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

Side by Side Diff: ash/root_window_controller.cc

Issue 11316323: Cleanup enums for shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 8 years 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/root_window_controller.h ('k') | ash/shelf_types.h » ('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/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/shelf_types.h"
14 #include "ash/shell.h" 15 #include "ash/shell.h"
15 #include "ash/shell_delegate.h" 16 #include "ash/shell_delegate.h"
16 #include "ash/shell_factory.h" 17 #include "ash/shell_factory.h"
17 #include "ash/shell_window_ids.h" 18 #include "ash/shell_window_ids.h"
18 #include "ash/system/status_area_widget.h" 19 #include "ash/system/status_area_widget.h"
19 #include "ash/system/tray/system_tray_delegate.h" 20 #include "ash/system/tray/system_tray_delegate.h"
20 #include "ash/wm/base_layout_manager.h" 21 #include "ash/wm/base_layout_manager.h"
21 #include "ash/wm/boot_splash_screen.h" 22 #include "ash/wm/boot_splash_screen.h"
22 #include "ash/wm/panel_layout_manager.h" 23 #include "ash/wm/panel_layout_manager.h"
23 #include "ash/wm/panel_window_event_filter.h" 24 #include "ash/wm/panel_window_event_filter.h"
24 #include "ash/wm/property_util.h" 25 #include "ash/wm/property_util.h"
25 #include "ash/wm/root_window_layout_manager.h" 26 #include "ash/wm/root_window_layout_manager.h"
26 #include "ash/wm/screen_dimmer.h" 27 #include "ash/wm/screen_dimmer.h"
27 #include "ash/wm/shelf_layout_manager.h" 28 #include "ash/wm/shelf_layout_manager.h"
28 #include "ash/wm/shelf_types.h"
29 #include "ash/wm/status_area_layout_manager.h" 29 #include "ash/wm/status_area_layout_manager.h"
30 #include "ash/wm/system_background_controller.h" 30 #include "ash/wm/system_background_controller.h"
31 #include "ash/wm/system_modal_container_layout_manager.h" 31 #include "ash/wm/system_modal_container_layout_manager.h"
32 #include "ash/wm/toplevel_window_event_handler.h" 32 #include "ash/wm/toplevel_window_event_handler.h"
33 #include "ash/wm/window_properties.h" 33 #include "ash/wm/window_properties.h"
34 #include "ash/wm/workspace_controller.h" 34 #include "ash/wm/workspace_controller.h"
35 #include "base/command_line.h" 35 #include "base/command_line.h"
36 #include "base/time.h" 36 #include "base/time.h"
37 #include "ui/aura/client/activation_client.h" 37 #include "ui/aura/client/activation_client.h"
38 #include "ui/aura/client/aura_constants.h" 38 #include "ui/aura/client/aura_constants.h"
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 "OverlayContainer", 651 "OverlayContainer",
652 lock_screen_related_containers); 652 lock_screen_related_containers);
653 SetUsesScreenCoordinates(overlay_container); 653 SetUsesScreenCoordinates(overlay_container);
654 654
655 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 655 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
656 "PowerButtonAnimationContainer", root_window) ; 656 "PowerButtonAnimationContainer", root_window) ;
657 } 657 }
658 658
659 } // namespace internal 659 } // namespace internal
660 } // namespace ash 660 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/shelf_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698