| 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 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1018 AddShellObserver(overlay_filter_.get()); | 1018 AddShellObserver(overlay_filter_.get()); |
| 1019 | 1019 |
| 1020 accelerator_filter_.reset(new ::wm::AcceleratorFilter( | 1020 accelerator_filter_.reset(new ::wm::AcceleratorFilter( |
| 1021 std::unique_ptr<::wm::AcceleratorDelegate>(new AcceleratorDelegate), | 1021 std::unique_ptr<::wm::AcceleratorDelegate>(new AcceleratorDelegate), |
| 1022 accelerator_controller_->accelerator_history())); | 1022 accelerator_controller_->accelerator_history())); |
| 1023 AddPreTargetHandler(accelerator_filter_.get()); | 1023 AddPreTargetHandler(accelerator_filter_.get()); |
| 1024 | 1024 |
| 1025 event_transformation_handler_.reset(new EventTransformationHandler); | 1025 event_transformation_handler_.reset(new EventTransformationHandler); |
| 1026 AddPreTargetHandler(event_transformation_handler_.get()); | 1026 AddPreTargetHandler(event_transformation_handler_.get()); |
| 1027 | 1027 |
| 1028 toplevel_window_event_handler_.reset(new ToplevelWindowEventHandler); | 1028 toplevel_window_event_handler_.reset( |
| 1029 new ToplevelWindowEventHandler(wm_globals_.get())); |
| 1029 | 1030 |
| 1030 system_gesture_filter_.reset(new SystemGestureEventFilter); | 1031 system_gesture_filter_.reset(new SystemGestureEventFilter); |
| 1031 AddPreTargetHandler(system_gesture_filter_.get()); | 1032 AddPreTargetHandler(system_gesture_filter_.get()); |
| 1032 | 1033 |
| 1033 keyboard_metrics_filter_.reset(new KeyboardUMAEventFilter); | 1034 keyboard_metrics_filter_.reset(new KeyboardUMAEventFilter); |
| 1034 AddPreTargetHandler(keyboard_metrics_filter_.get()); | 1035 AddPreTargetHandler(keyboard_metrics_filter_.get()); |
| 1035 | 1036 |
| 1036 #if defined(OS_CHROMEOS) | 1037 #if defined(OS_CHROMEOS) |
| 1037 sticky_keys_controller_.reset(new StickyKeysController); | 1038 sticky_keys_controller_.reset(new StickyKeysController); |
| 1038 #endif | 1039 #endif |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1264 | 1265 |
| 1265 void Shell::OnWindowActivated( | 1266 void Shell::OnWindowActivated( |
| 1266 aura::client::ActivationChangeObserver::ActivationReason reason, | 1267 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 1267 aura::Window* gained_active, | 1268 aura::Window* gained_active, |
| 1268 aura::Window* lost_active) { | 1269 aura::Window* lost_active) { |
| 1269 if (gained_active) | 1270 if (gained_active) |
| 1270 target_root_window_ = gained_active->GetRootWindow(); | 1271 target_root_window_ = gained_active->GetRootWindow(); |
| 1271 } | 1272 } |
| 1272 | 1273 |
| 1273 } // namespace ash | 1274 } // namespace ash |
| OLD | NEW |