| 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/accelerator_controller.h" |    10 #include "ash/accelerators/accelerator_controller.h" | 
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   107 #include "ui/wm/core/input_method_event_filter.h" |   107 #include "ui/wm/core/input_method_event_filter.h" | 
|   108 #include "ui/wm/core/shadow_controller.h" |   108 #include "ui/wm/core/shadow_controller.h" | 
|   109 #include "ui/wm/core/user_activity_detector.h" |   109 #include "ui/wm/core/user_activity_detector.h" | 
|   110 #include "ui/wm/core/visibility_controller.h" |   110 #include "ui/wm/core/visibility_controller.h" | 
|   111 #include "ui/wm/core/window_modality_controller.h" |   111 #include "ui/wm/core/window_modality_controller.h" | 
|   112  |   112  | 
|   113 #if defined(OS_CHROMEOS) |   113 #if defined(OS_CHROMEOS) | 
|   114 #if defined(USE_X11) |   114 #if defined(USE_X11) | 
|   115 #include "ash/accelerators/magnifier_key_scroller.h" |   115 #include "ash/accelerators/magnifier_key_scroller.h" | 
|   116 #include "ash/accelerators/spoken_feedback_toggler.h" |   116 #include "ash/accelerators/spoken_feedback_toggler.h" | 
|   117 #include "base/message_loop/message_pump_x11.h" |   117 #include "ui/gfx/x/x11_types.h" | 
|   118 #endif  // defined(USE_X11) |   118 #endif  // defined(USE_X11) | 
|   119 #include "ash/ash_constants.h" |   119 #include "ash/ash_constants.h" | 
|   120 #include "ash/display/display_change_observer_chromeos.h" |   120 #include "ash/display/display_change_observer_chromeos.h" | 
|   121 #include "ash/display/display_error_observer_chromeos.h" |   121 #include "ash/display/display_error_observer_chromeos.h" | 
|   122 #include "ash/display/output_configurator_animation.h" |   122 #include "ash/display/output_configurator_animation.h" | 
|   123 #include "ash/display/projecting_observer_chromeos.h" |   123 #include "ash/display/projecting_observer_chromeos.h" | 
|   124 #include "ash/display/resolution_notification_controller.h" |   124 #include "ash/display/resolution_notification_controller.h" | 
|   125 #include "ash/sticky_keys/sticky_keys_controller.h" |   125 #include "ash/sticky_keys/sticky_keys_controller.h" | 
|   126 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h" |   126 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h" | 
|   127 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" |   127 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" | 
| (...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1109 //////////////////////////////////////////////////////////////////////////////// |  1109 //////////////////////////////////////////////////////////////////////////////// | 
|  1110 // Shell, aura::client::ActivationChangeObserver implementation: |  1110 // Shell, aura::client::ActivationChangeObserver implementation: | 
|  1111  |  1111  | 
|  1112 void Shell::OnWindowActivated(aura::Window* gained_active, |  1112 void Shell::OnWindowActivated(aura::Window* gained_active, | 
|  1113                               aura::Window* lost_active) { |  1113                               aura::Window* lost_active) { | 
|  1114   if (gained_active) |  1114   if (gained_active) | 
|  1115     target_root_window_ = gained_active->GetRootWindow(); |  1115     target_root_window_ = gained_active->GetRootWindow(); | 
|  1116 } |  1116 } | 
|  1117  |  1117  | 
|  1118 }  // namespace ash |  1118 }  // namespace ash | 
| OLD | NEW |