| 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" |
| 11 #include "ash/ash_switches.h" | 11 #include "ash/ash_switches.h" |
| 12 #include "ash/caps_lock_delegate.h" | 12 #include "ash/caps_lock_delegate.h" |
| 13 #include "ash/desktop_background/desktop_background_controller.h" | 13 #include "ash/desktop_background/desktop_background_controller.h" |
| 14 #include "ash/desktop_background/desktop_background_resources.h" | 14 #include "ash/desktop_background/desktop_background_resources.h" |
| 15 #include "ash/desktop_background/desktop_background_view.h" | 15 #include "ash/desktop_background/desktop_background_view.h" |
| 16 #include "ash/desktop_background/user_wallpaper_delegate.h" | 16 #include "ash/desktop_background/user_wallpaper_delegate.h" |
| 17 #include "ash/display/display_controller.h" | 17 #include "ash/display/display_controller.h" |
| 18 #include "ash/display/mouse_cursor_event_filter.h" | 18 #include "ash/display/mouse_cursor_event_filter.h" |
| 19 #include "ash/display/display_manager.h" | 19 #include "ash/display/display_manager.h" |
| 20 #include "ash/display/screen_position_controller.h" | 20 #include "ash/display/screen_position_controller.h" |
| 21 #include "ash/drag_drop/drag_drop_controller.h" | 21 #include "ash/drag_drop/drag_drop_controller.h" |
| 22 #include "ash/focus_cycler.h" | 22 #include "ash/focus_cycler.h" |
| 23 #include "ash/high_contrast/high_contrast_controller.h" | 23 #include "ash/high_contrast/high_contrast_controller.h" |
| 24 #include "ash/magnifier/magnification_controller.h" | 24 #include "ash/magnifier/magnification_controller.h" |
| 25 #include "ash/magnifier/partial_magnification_controller.h" |
| 25 #include "ash/root_window_controller.h" | 26 #include "ash/root_window_controller.h" |
| 26 #include "ash/screen_ash.h" | 27 #include "ash/screen_ash.h" |
| 27 #include "ash/shell_delegate.h" | 28 #include "ash/shell_delegate.h" |
| 28 #include "ash/shell_factory.h" | 29 #include "ash/shell_factory.h" |
| 29 #include "ash/shell_window_ids.h" | 30 #include "ash/shell_window_ids.h" |
| 30 #include "ash/system/status_area_widget.h" | 31 #include "ash/system/status_area_widget.h" |
| 31 #include "ash/system/tray/system_tray_delegate.h" | 32 #include "ash/system/tray/system_tray_delegate.h" |
| 32 #include "ash/system/tray/system_tray_notifier.h" | 33 #include "ash/system/tray/system_tray_notifier.h" |
| 33 #include "ash/tooltips/tooltip_controller.h" | 34 #include "ash/tooltips/tooltip_controller.h" |
| 34 #include "ash/touch/touch_observer_hud.h" | 35 #include "ash/touch/touch_observer_hud.h" |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 system_tray_notifier_.reset(); | 267 system_tray_notifier_.reset(); |
| 267 | 268 |
| 268 // Destroy all child windows including widgets. | 269 // Destroy all child windows including widgets. |
| 269 display_controller_->CloseChildWindows(); | 270 display_controller_->CloseChildWindows(); |
| 270 | 271 |
| 271 // These need a valid Shell instance to clean up properly, so explicitly | 272 // These need a valid Shell instance to clean up properly, so explicitly |
| 272 // delete them before invalidating the instance. | 273 // delete them before invalidating the instance. |
| 273 // Alphabetical. | 274 // Alphabetical. |
| 274 drag_drop_controller_.reset(); | 275 drag_drop_controller_.reset(); |
| 275 magnification_controller_.reset(); | 276 magnification_controller_.reset(); |
| 277 partial_magnification_controller_.reset(); |
| 276 power_button_controller_.reset(); | 278 power_button_controller_.reset(); |
| 277 session_state_controller_.reset(); | 279 session_state_controller_.reset(); |
| 278 resize_shadow_controller_.reset(); | 280 resize_shadow_controller_.reset(); |
| 279 shadow_controller_.reset(); | 281 shadow_controller_.reset(); |
| 280 tooltip_controller_.reset(); | 282 tooltip_controller_.reset(); |
| 281 event_client_.reset(); | 283 event_client_.reset(); |
| 282 window_cycle_controller_.reset(); | 284 window_cycle_controller_.reset(); |
| 283 capture_controller_.reset(); | 285 capture_controller_.reset(); |
| 284 nested_dispatcher_controller_.reset(); | 286 nested_dispatcher_controller_.reset(); |
| 285 user_action_client_.reset(); | 287 user_action_client_.reset(); |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 stacking_client_.reset(delegate_->CreateStackingClient()); | 474 stacking_client_.reset(delegate_->CreateStackingClient()); |
| 473 if (stacking_client_.get()) | 475 if (stacking_client_.get()) |
| 474 aura::client::SetStackingClient(stacking_client_.get()); | 476 aura::client::SetStackingClient(stacking_client_.get()); |
| 475 visibility_controller_.reset(new internal::VisibilityController); | 477 visibility_controller_.reset(new internal::VisibilityController); |
| 476 drag_drop_controller_.reset(new internal::DragDropController); | 478 drag_drop_controller_.reset(new internal::DragDropController); |
| 477 user_action_client_.reset(delegate_->CreateUserActionClient()); | 479 user_action_client_.reset(delegate_->CreateUserActionClient()); |
| 478 window_modality_controller_.reset(new internal::WindowModalityController); | 480 window_modality_controller_.reset(new internal::WindowModalityController); |
| 479 AddPreTargetHandler(window_modality_controller_.get()); | 481 AddPreTargetHandler(window_modality_controller_.get()); |
| 480 | 482 |
| 481 magnification_controller_.reset( | 483 magnification_controller_.reset( |
| 482 internal::MagnificationController::CreateInstance()); | 484 MagnificationController::CreateInstance()); |
| 485 |
| 486 partial_magnification_controller_.reset( |
| 487 new PartialMagnificationController()); |
| 483 | 488 |
| 484 high_contrast_controller_.reset(new HighContrastController); | 489 high_contrast_controller_.reset(new HighContrastController); |
| 485 video_detector_.reset(new VideoDetector); | 490 video_detector_.reset(new VideoDetector); |
| 486 window_cycle_controller_.reset( | 491 window_cycle_controller_.reset( |
| 487 new WindowCycleController(activation_controller_.get())); | 492 new WindowCycleController(activation_controller_.get())); |
| 488 | 493 |
| 489 tooltip_controller_.reset(new internal::TooltipController( | 494 tooltip_controller_.reset(new internal::TooltipController( |
| 490 drag_drop_controller_.get())); | 495 drag_drop_controller_.get())); |
| 491 AddPreTargetHandler(tooltip_controller_.get()); | 496 AddPreTargetHandler(tooltip_controller_.get()); |
| 492 | 497 |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 849 | 854 |
| 850 bool Shell::CanAcceptEvents() { | 855 bool Shell::CanAcceptEvents() { |
| 851 return true; | 856 return true; |
| 852 } | 857 } |
| 853 | 858 |
| 854 ui::EventTarget* Shell::GetParentTarget() { | 859 ui::EventTarget* Shell::GetParentTarget() { |
| 855 return NULL; | 860 return NULL; |
| 856 } | 861 } |
| 857 | 862 |
| 858 } // namespace ash | 863 } // namespace ash |
| OLD | NEW |