| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "ash/frame/custom_frame_view_ash.h" | 50 #include "ash/frame/custom_frame_view_ash.h" |
| 51 #include "ash/high_contrast/high_contrast_controller.h" | 51 #include "ash/high_contrast/high_contrast_controller.h" |
| 52 #include "ash/host/ash_window_tree_host_init_params.h" | 52 #include "ash/host/ash_window_tree_host_init_params.h" |
| 53 #include "ash/ime/input_method_event_handler.h" | 53 #include "ash/ime/input_method_event_handler.h" |
| 54 #include "ash/magnifier/magnification_controller.h" | 54 #include "ash/magnifier/magnification_controller.h" |
| 55 #include "ash/magnifier/partial_magnification_controller.h" | 55 #include "ash/magnifier/partial_magnification_controller.h" |
| 56 #include "ash/root_window_controller.h" | 56 #include "ash/root_window_controller.h" |
| 57 #include "ash/shelf/shelf.h" | 57 #include "ash/shelf/shelf.h" |
| 58 #include "ash/shelf/shelf_widget.h" | 58 #include "ash/shelf/shelf_widget.h" |
| 59 #include "ash/shelf/shelf_window_watcher.h" | 59 #include "ash/shelf/shelf_window_watcher.h" |
| 60 #include "ash/shell_factory.h" | |
| 61 #include "ash/shell_init_params.h" | 60 #include "ash/shell_init_params.h" |
| 62 #include "ash/utility/screenshot_controller.h" | 61 #include "ash/utility/screenshot_controller.h" |
| 63 #include "ash/wm/ash_focus_rules.h" | 62 #include "ash/wm/ash_focus_rules.h" |
| 64 #include "ash/wm/ash_native_cursor_manager.h" | 63 #include "ash/wm/ash_native_cursor_manager.h" |
| 65 #include "ash/wm/event_client_impl.h" | 64 #include "ash/wm/event_client_impl.h" |
| 66 #include "ash/wm/lock_state_controller.h" | 65 #include "ash/wm/lock_state_controller.h" |
| 67 #include "ash/wm/overlay_event_filter.h" | 66 #include "ash/wm/overlay_event_filter.h" |
| 68 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" | 67 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" |
| 69 #include "ash/wm/power_button_controller.h" | 68 #include "ash/wm/power_button_controller.h" |
| 70 #include "ash/wm/resize_shadow_controller.h" | 69 #include "ash/wm/resize_shadow_controller.h" |
| (...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1088 | 1087 |
| 1089 void Shell::OnWindowActivated( | 1088 void Shell::OnWindowActivated( |
| 1090 aura::client::ActivationChangeObserver::ActivationReason reason, | 1089 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 1091 aura::Window* gained_active, | 1090 aura::Window* gained_active, |
| 1092 aura::Window* lost_active) { | 1091 aura::Window* lost_active) { |
| 1093 if (gained_active) | 1092 if (gained_active) |
| 1094 target_root_window_ = gained_active->GetRootWindow(); | 1093 target_root_window_ = gained_active->GetRootWindow(); |
| 1095 } | 1094 } |
| 1096 | 1095 |
| 1097 } // namespace ash | 1096 } // namespace ash |
| OLD | NEW |