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 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 | 742 |
743 window_modality_controller_.reset(new internal::WindowModalityController); | 743 window_modality_controller_.reset(new internal::WindowModalityController); |
744 AddRootWindowEventFilter(window_modality_controller_.get()); | 744 AddRootWindowEventFilter(window_modality_controller_.get()); |
745 | 745 |
746 visibility_controller_.reset(new internal::VisibilityController); | 746 visibility_controller_.reset(new internal::VisibilityController); |
747 | 747 |
748 tooltip_controller_.reset(new internal::TooltipController); | 748 tooltip_controller_.reset(new internal::TooltipController); |
749 AddRootWindowEventFilter(tooltip_controller_.get()); | 749 AddRootWindowEventFilter(tooltip_controller_.get()); |
750 | 750 |
751 drag_drop_controller_.reset(new internal::DragDropController); | 751 drag_drop_controller_.reset(new internal::DragDropController); |
752 magnification_controller_.reset(new internal::MagnificationController); | 752 magnification_controller_.reset( |
| 753 internal::MagnificationController::CreateInstance()); |
| 754 AddRootWindowEventFilter(magnification_controller_.get()); |
753 power_button_controller_.reset(new PowerButtonController); | 755 power_button_controller_.reset(new PowerButtonController); |
754 AddShellObserver(power_button_controller_.get()); | 756 AddShellObserver(power_button_controller_.get()); |
755 video_detector_.reset(new VideoDetector); | 757 video_detector_.reset(new VideoDetector); |
756 window_cycle_controller_.reset(new WindowCycleController); | 758 window_cycle_controller_.reset(new WindowCycleController); |
757 monitor_controller_.reset(new internal::MonitorController); | 759 monitor_controller_.reset(new internal::MonitorController); |
758 screen_dimmer_.reset(new internal::ScreenDimmer); | 760 screen_dimmer_.reset(new internal::ScreenDimmer); |
759 | 761 |
760 views::FocusManagerFactory::Install(new AshFocusManagerFactory); | 762 views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
761 } | 763 } |
762 | 764 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
954 panel_container->SetLayoutManager(panel_layout_manager_); | 956 panel_container->SetLayoutManager(panel_layout_manager_); |
955 } | 957 } |
956 } | 958 } |
957 | 959 |
958 void Shell::DisableWorkspaceGridLayout() { | 960 void Shell::DisableWorkspaceGridLayout() { |
959 if (workspace_controller_.get()) | 961 if (workspace_controller_.get()) |
960 workspace_controller_->workspace_manager()->set_grid_size(0); | 962 workspace_controller_->workspace_manager()->set_grid_size(0); |
961 } | 963 } |
962 | 964 |
963 } // namespace ash | 965 } // namespace ash |
OLD | NEW |