| 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 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1041 mouse_cursor_filter_.reset(new MouseCursorEventFilter()); | 1041 mouse_cursor_filter_.reset(new MouseCursorEventFilter()); |
| 1042 PrependPreTargetHandler(mouse_cursor_filter_.get()); | 1042 PrependPreTargetHandler(mouse_cursor_filter_.get()); |
| 1043 | 1043 |
| 1044 // Create Controllers that may need root window. | 1044 // Create Controllers that may need root window. |
| 1045 // TODO(oshima): Move as many controllers before creating | 1045 // TODO(oshima): Move as many controllers before creating |
| 1046 // RootWindowController as possible. | 1046 // RootWindowController as possible. |
| 1047 visibility_controller_.reset(new AshVisibilityController); | 1047 visibility_controller_.reset(new AshVisibilityController); |
| 1048 | 1048 |
| 1049 magnification_controller_.reset( | 1049 magnification_controller_.reset( |
| 1050 MagnificationController::CreateInstance()); | 1050 MagnificationController::CreateInstance()); |
| 1051 mru_window_tracker_.reset(new MruWindowTracker(activation_client_, | 1051 mru_window_tracker_.reset(new MruWindowTracker); |
| 1052 focus_rules)); | |
| 1053 | 1052 |
| 1054 partial_magnification_controller_.reset( | 1053 partial_magnification_controller_.reset( |
| 1055 new PartialMagnificationController()); | 1054 new PartialMagnificationController()); |
| 1056 | 1055 |
| 1057 autoclick_controller_.reset(AutoclickController::CreateInstance()); | 1056 autoclick_controller_.reset(AutoclickController::CreateInstance()); |
| 1058 | 1057 |
| 1059 high_contrast_controller_.reset(new HighContrastController); | 1058 high_contrast_controller_.reset(new HighContrastController); |
| 1060 video_detector_.reset(new VideoDetector); | 1059 video_detector_.reset(new VideoDetector); |
| 1061 window_selector_controller_.reset(new WindowSelectorController()); | 1060 window_selector_controller_.reset(new WindowSelectorController()); |
| 1062 window_cycle_controller_.reset(new WindowCycleController()); | 1061 window_cycle_controller_.reset(new WindowCycleController()); |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1249 | 1248 |
| 1250 void Shell::OnWindowActivated( | 1249 void Shell::OnWindowActivated( |
| 1251 aura::client::ActivationChangeObserver::ActivationReason reason, | 1250 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 1252 aura::Window* gained_active, | 1251 aura::Window* gained_active, |
| 1253 aura::Window* lost_active) { | 1252 aura::Window* lost_active) { |
| 1254 if (gained_active) | 1253 if (gained_active) |
| 1255 target_root_window_ = gained_active->GetRootWindow(); | 1254 target_root_window_ = gained_active->GetRootWindow(); |
| 1256 } | 1255 } |
| 1257 | 1256 |
| 1258 } // namespace ash | 1257 } // namespace ash |
| OLD | NEW |