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