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/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
729 window_modality_controller_.reset(new internal::WindowModalityController); | 729 window_modality_controller_.reset(new internal::WindowModalityController); |
730 AddRootWindowEventFilter(window_modality_controller_.get()); | 730 AddRootWindowEventFilter(window_modality_controller_.get()); |
731 | 731 |
732 visibility_controller_.reset(new internal::VisibilityController); | 732 visibility_controller_.reset(new internal::VisibilityController); |
733 | 733 |
734 tooltip_controller_.reset(new internal::TooltipController); | 734 tooltip_controller_.reset(new internal::TooltipController); |
735 AddRootWindowEventFilter(tooltip_controller_.get()); | 735 AddRootWindowEventFilter(tooltip_controller_.get()); |
736 | 736 |
737 drag_drop_controller_.reset(new internal::DragDropController); | 737 drag_drop_controller_.reset(new internal::DragDropController); |
738 magnification_controller_.reset(new internal::MagnificationController); | 738 magnification_controller_.reset(new internal::MagnificationController); |
| 739 AddRootWindowEventFilter(magnification_controller_->GetEventFilter()); |
739 power_button_controller_.reset(new PowerButtonController); | 740 power_button_controller_.reset(new PowerButtonController); |
740 AddShellObserver(power_button_controller_.get()); | 741 AddShellObserver(power_button_controller_.get()); |
741 video_detector_.reset(new VideoDetector); | 742 video_detector_.reset(new VideoDetector); |
742 window_cycle_controller_.reset(new WindowCycleController); | 743 window_cycle_controller_.reset(new WindowCycleController); |
743 monitor_controller_.reset(new internal::MonitorController); | 744 monitor_controller_.reset(new internal::MonitorController); |
744 screen_dimmer_.reset(new internal::ScreenDimmer); | 745 screen_dimmer_.reset(new internal::ScreenDimmer); |
745 } | 746 } |
746 | 747 |
747 aura::Window* Shell::GetContainer(int container_id) { | 748 aura::Window* Shell::GetContainer(int container_id) { |
748 return const_cast<aura::Window*>( | 749 return const_cast<aura::Window*>( |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 panel_container->SetLayoutManager(panel_layout_manager_); | 939 panel_container->SetLayoutManager(panel_layout_manager_); |
939 } | 940 } |
940 } | 941 } |
941 | 942 |
942 void Shell::DisableWorkspaceGridLayout() { | 943 void Shell::DisableWorkspaceGridLayout() { |
943 if (workspace_controller_.get()) | 944 if (workspace_controller_.get()) |
944 workspace_controller_->workspace_manager()->set_grid_size(0); | 945 workspace_controller_->workspace_manager()->set_grid_size(0); |
945 } | 946 } |
946 | 947 |
947 } // namespace ash | 948 } // namespace ash |
OLD | NEW |