OLD | NEW |
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/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/accelerators/focus_manager_factory.h" | 10 #include "ash/accelerators/focus_manager_factory.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 #include "ash/wm/event_rewriter_event_filter.h" | 44 #include "ash/wm/event_rewriter_event_filter.h" |
45 #include "ash/wm/overlay_event_filter.h" | 45 #include "ash/wm/overlay_event_filter.h" |
46 #include "ash/wm/power_button_controller.h" | 46 #include "ash/wm/power_button_controller.h" |
47 #include "ash/wm/property_util.h" | 47 #include "ash/wm/property_util.h" |
48 #include "ash/wm/resize_shadow_controller.h" | 48 #include "ash/wm/resize_shadow_controller.h" |
49 #include "ash/wm/root_window_layout_manager.h" | 49 #include "ash/wm/root_window_layout_manager.h" |
50 #include "ash/wm/screen_dimmer.h" | 50 #include "ash/wm/screen_dimmer.h" |
51 #include "ash/wm/session_state_controller.h" | 51 #include "ash/wm/session_state_controller.h" |
52 #include "ash/wm/session_state_controller_impl.h" | 52 #include "ash/wm/session_state_controller_impl.h" |
53 #include "ash/wm/session_state_controller_impl2.h" | 53 #include "ash/wm/session_state_controller_impl2.h" |
54 #include "ash/wm/shadow_controller.h" | |
55 #include "ash/wm/stacking_controller.h" | 54 #include "ash/wm/stacking_controller.h" |
56 #include "ash/wm/system_gesture_event_filter.h" | 55 #include "ash/wm/system_gesture_event_filter.h" |
57 #include "ash/wm/system_modal_container_event_filter.h" | 56 #include "ash/wm/system_modal_container_event_filter.h" |
58 #include "ash/wm/system_modal_container_layout_manager.h" | 57 #include "ash/wm/system_modal_container_layout_manager.h" |
59 #include "ash/wm/user_activity_detector.h" | 58 #include "ash/wm/user_activity_detector.h" |
60 #include "ash/wm/video_detector.h" | 59 #include "ash/wm/video_detector.h" |
61 #include "ash/wm/visibility_controller.h" | 60 #include "ash/wm/visibility_controller.h" |
62 #include "ash/wm/window_cycle_controller.h" | 61 #include "ash/wm/window_cycle_controller.h" |
63 #include "ash/wm/window_modality_controller.h" | 62 #include "ash/wm/window_modality_controller.h" |
64 #include "ash/wm/window_properties.h" | 63 #include "ash/wm/window_properties.h" |
(...skipping 13 matching lines...) Expand all Loading... |
78 #include "ui/aura/window.h" | 77 #include "ui/aura/window.h" |
79 #include "ui/compositor/layer.h" | 78 #include "ui/compositor/layer.h" |
80 #include "ui/compositor/layer_animator.h" | 79 #include "ui/compositor/layer_animator.h" |
81 #include "ui/gfx/display.h" | 80 #include "ui/gfx/display.h" |
82 #include "ui/gfx/image/image_skia.h" | 81 #include "ui/gfx/image/image_skia.h" |
83 #include "ui/gfx/screen.h" | 82 #include "ui/gfx/screen.h" |
84 #include "ui/gfx/size.h" | 83 #include "ui/gfx/size.h" |
85 #include "ui/ui_controls/ui_controls.h" | 84 #include "ui/ui_controls/ui_controls.h" |
86 #include "ui/views/corewm/compound_event_filter.h" | 85 #include "ui/views/corewm/compound_event_filter.h" |
87 #include "ui/views/corewm/input_method_event_filter.h" | 86 #include "ui/views/corewm/input_method_event_filter.h" |
| 87 #include "ui/views/corewm/shadow_controller.h" |
88 #include "ui/views/focus/focus_manager_factory.h" | 88 #include "ui/views/focus/focus_manager_factory.h" |
89 #include "ui/views/widget/native_widget_aura.h" | 89 #include "ui/views/widget/native_widget_aura.h" |
90 #include "ui/views/widget/widget.h" | 90 #include "ui/views/widget/widget.h" |
91 | 91 |
92 #if !defined(OS_MACOSX) | 92 #if !defined(OS_MACOSX) |
93 #include "ash/accelerators/accelerator_controller.h" | 93 #include "ash/accelerators/accelerator_controller.h" |
94 #include "ash/accelerators/accelerator_filter.h" | 94 #include "ash/accelerators/accelerator_filter.h" |
95 #include "ash/accelerators/nested_dispatcher_controller.h" | 95 #include "ash/accelerators/nested_dispatcher_controller.h" |
96 #endif | 96 #endif |
97 | 97 |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 desktop_background_controller_.reset(new DesktopBackgroundController()); | 498 desktop_background_controller_.reset(new DesktopBackgroundController()); |
499 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); | 499 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); |
500 if (!user_wallpaper_delegate_.get()) | 500 if (!user_wallpaper_delegate_.get()) |
501 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); | 501 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); |
502 | 502 |
503 // StatusAreaWidget uses Shell's CapsLockDelegate. | 503 // StatusAreaWidget uses Shell's CapsLockDelegate. |
504 caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate()); | 504 caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate()); |
505 | 505 |
506 if (!command_line->HasSwitch(switches::kAuraNoShadows)) { | 506 if (!command_line->HasSwitch(switches::kAuraNoShadows)) { |
507 resize_shadow_controller_.reset(new internal::ResizeShadowController()); | 507 resize_shadow_controller_.reset(new internal::ResizeShadowController()); |
508 shadow_controller_.reset(new internal::ShadowController()); | 508 shadow_controller_.reset( |
| 509 new views::corewm::ShadowController(GetPrimaryRootWindow())); |
509 } | 510 } |
510 | 511 |
511 // Create system_tray_notifier_ before the delegate. | 512 // Create system_tray_notifier_ before the delegate. |
512 system_tray_notifier_.reset(new ash::SystemTrayNotifier()); | 513 system_tray_notifier_.reset(new ash::SystemTrayNotifier()); |
513 | 514 |
514 // Initialize system_tray_delegate_ before initializing StatusAreaWidget. | 515 // Initialize system_tray_delegate_ before initializing StatusAreaWidget. |
515 system_tray_delegate_.reset(delegate()->CreateSystemTrayDelegate()); | 516 system_tray_delegate_.reset(delegate()->CreateSystemTrayDelegate()); |
516 if (!system_tray_delegate_.get()) | 517 if (!system_tray_delegate_.get()) |
517 system_tray_delegate_.reset(SystemTrayDelegate::CreateDummyDelegate()); | 518 system_tray_delegate_.reset(SystemTrayDelegate::CreateDummyDelegate()); |
518 | 519 |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
848 | 849 |
849 bool Shell::CanAcceptEvents() { | 850 bool Shell::CanAcceptEvents() { |
850 return true; | 851 return true; |
851 } | 852 } |
852 | 853 |
853 ui::EventTarget* Shell::GetParentTarget() { | 854 ui::EventTarget* Shell::GetParentTarget() { |
854 return NULL; | 855 return NULL; |
855 } | 856 } |
856 | 857 |
857 } // namespace ash | 858 } // namespace ash |
OLD | NEW |