Chromium Code Reviews| 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 18 matching lines...) Expand all Loading... | |
| 29 #include "ash/focus_cycler.h" | 29 #include "ash/focus_cycler.h" |
| 30 #include "ash/frame/custom_frame_view_ash.h" | 30 #include "ash/frame/custom_frame_view_ash.h" |
| 31 #include "ash/gpu_support.h" | 31 #include "ash/gpu_support.h" |
| 32 #include "ash/high_contrast/high_contrast_controller.h" | 32 #include "ash/high_contrast/high_contrast_controller.h" |
| 33 #include "ash/host/ash_window_tree_host_init_params.h" | 33 #include "ash/host/ash_window_tree_host_init_params.h" |
| 34 #include "ash/ime/input_method_event_handler.h" | 34 #include "ash/ime/input_method_event_handler.h" |
| 35 #include "ash/keyboard/keyboard_ui.h" | 35 #include "ash/keyboard/keyboard_ui.h" |
| 36 #include "ash/keyboard_uma_event_filter.h" | 36 #include "ash/keyboard_uma_event_filter.h" |
| 37 #include "ash/magnifier/magnification_controller.h" | 37 #include "ash/magnifier/magnification_controller.h" |
| 38 #include "ash/magnifier/partial_magnification_controller.h" | 38 #include "ash/magnifier/partial_magnification_controller.h" |
| 39 #include "ash/material_design/material_design_controller.h" | |
|
bruthig
2016/05/25 20:24:52
Is this needed/used?
yiyix
2016/06/02 03:54:53
Done.
| |
| 39 #include "ash/media_delegate.h" | 40 #include "ash/media_delegate.h" |
| 40 #include "ash/new_window_delegate.h" | 41 #include "ash/new_window_delegate.h" |
| 41 #include "ash/pointer_watcher_delegate.h" | 42 #include "ash/pointer_watcher_delegate.h" |
| 42 #include "ash/root_window_controller.h" | 43 #include "ash/root_window_controller.h" |
| 43 #include "ash/session/session_state_delegate.h" | 44 #include "ash/session/session_state_delegate.h" |
| 44 #include "ash/shelf/app_list_shelf_item_delegate.h" | 45 #include "ash/shelf/app_list_shelf_item_delegate.h" |
| 45 #include "ash/shelf/shelf.h" | 46 #include "ash/shelf/shelf.h" |
| 46 #include "ash/shelf/shelf_delegate.h" | 47 #include "ash/shelf/shelf_delegate.h" |
| 47 #include "ash/shelf/shelf_item_delegate.h" | 48 #include "ash/shelf/shelf_item_delegate.h" |
| 48 #include "ash/shelf/shelf_item_delegate_manager.h" | 49 #include "ash/shelf/shelf_item_delegate_manager.h" |
| (...skipping 1215 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 |