| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 #include "ash/wm/screen_dimmer.h" | 58 #include "ash/wm/screen_dimmer.h" |
| 59 #include "ash/wm/session_state_controller_impl.h" | 59 #include "ash/wm/session_state_controller_impl.h" |
| 60 #include "ash/wm/system_gesture_event_filter.h" | 60 #include "ash/wm/system_gesture_event_filter.h" |
| 61 #include "ash/wm/system_modal_container_event_filter.h" | 61 #include "ash/wm/system_modal_container_event_filter.h" |
| 62 #include "ash/wm/system_modal_container_layout_manager.h" | 62 #include "ash/wm/system_modal_container_layout_manager.h" |
| 63 #include "ash/wm/user_activity_detector.h" | 63 #include "ash/wm/user_activity_detector.h" |
| 64 #include "ash/wm/video_detector.h" | 64 #include "ash/wm/video_detector.h" |
| 65 #include "ash/wm/window_animations.h" | 65 #include "ash/wm/window_animations.h" |
| 66 #include "ash/wm/window_cycle_controller.h" | 66 #include "ash/wm/window_cycle_controller.h" |
| 67 #include "ash/wm/window_properties.h" | 67 #include "ash/wm/window_properties.h" |
| 68 #include "ash/wm/window_selector_controller.h" |
| 68 #include "ash/wm/window_util.h" | 69 #include "ash/wm/window_util.h" |
| 69 #include "ash/wm/workspace_controller.h" | 70 #include "ash/wm/workspace_controller.h" |
| 70 #include "base/bind.h" | 71 #include "base/bind.h" |
| 71 #include "base/command_line.h" | 72 #include "base/command_line.h" |
| 72 #include "base/debug/leak_annotations.h" | 73 #include "base/debug/leak_annotations.h" |
| 73 #include "ui/aura/client/aura_constants.h" | 74 #include "ui/aura/client/aura_constants.h" |
| 74 #include "ui/aura/client/user_action_client.h" | 75 #include "ui/aura/client/user_action_client.h" |
| 75 #include "ui/aura/env.h" | 76 #include "ui/aura/env.h" |
| 76 #include "ui/aura/focus_manager.h" | 77 #include "ui/aura/focus_manager.h" |
| 77 #include "ui/aura/layout_manager.h" | 78 #include "ui/aura/layout_manager.h" |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 | 564 |
| 564 magnification_controller_.reset( | 565 magnification_controller_.reset( |
| 565 MagnificationController::CreateInstance()); | 566 MagnificationController::CreateInstance()); |
| 566 | 567 |
| 567 partial_magnification_controller_.reset( | 568 partial_magnification_controller_.reset( |
| 568 new PartialMagnificationController()); | 569 new PartialMagnificationController()); |
| 569 | 570 |
| 570 high_contrast_controller_.reset(new HighContrastController); | 571 high_contrast_controller_.reset(new HighContrastController); |
| 571 video_detector_.reset(new VideoDetector); | 572 video_detector_.reset(new VideoDetector); |
| 572 window_cycle_controller_.reset(new WindowCycleController(activation_client_)); | 573 window_cycle_controller_.reset(new WindowCycleController(activation_client_)); |
| 574 window_selector_controller_.reset(new WindowSelectorController()); |
| 573 | 575 |
| 574 tooltip_controller_.reset(new views::corewm::TooltipController( | 576 tooltip_controller_.reset(new views::corewm::TooltipController( |
| 575 gfx::SCREEN_TYPE_ALTERNATE)); | 577 gfx::SCREEN_TYPE_ALTERNATE)); |
| 576 AddPreTargetHandler(tooltip_controller_.get()); | 578 AddPreTargetHandler(tooltip_controller_.get()); |
| 577 | 579 |
| 578 event_client_.reset(new internal::EventClientImpl); | 580 event_client_.reset(new internal::EventClientImpl); |
| 579 | 581 |
| 580 // This controller needs to be set before SetupManagedWindowMode. | 582 // This controller needs to be set before SetupManagedWindowMode. |
| 581 desktop_background_controller_.reset(new DesktopBackgroundController()); | 583 desktop_background_controller_.reset(new DesktopBackgroundController()); |
| 582 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); | 584 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 //////////////////////////////////////////////////////////////////////////////// | 962 //////////////////////////////////////////////////////////////////////////////// |
| 961 // Shell, aura::client::ActivationChangeObserver implementation: | 963 // Shell, aura::client::ActivationChangeObserver implementation: |
| 962 | 964 |
| 963 void Shell::OnWindowActivated(aura::Window* gained_active, | 965 void Shell::OnWindowActivated(aura::Window* gained_active, |
| 964 aura::Window* lost_active) { | 966 aura::Window* lost_active) { |
| 965 if (gained_active) | 967 if (gained_active) |
| 966 active_root_window_ = gained_active->GetRootWindow(); | 968 active_root_window_ = gained_active->GetRootWindow(); |
| 967 } | 969 } |
| 968 | 970 |
| 969 } // namespace ash | 971 } // namespace ash |
| OLD | NEW |