| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/common/wm_shell.h" | 5 #include "ash/wm_shell.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" | 
| 10 #include "ash/common/accelerators/ash_focus_manager_factory.h" | 10 #include "ash/accelerators/ash_focus_manager_factory.h" | 
| 11 #include "ash/common/accessibility_delegate.h" | 11 #include "ash/accessibility_delegate.h" | 
| 12 #include "ash/common/cast_config_controller.h" | 12 #include "ash/cast_config_controller.h" | 
| 13 #include "ash/common/devtools/ash_devtools_css_agent.h" | 13 #include "ash/devtools/ash_devtools_css_agent.h" | 
| 14 #include "ash/common/devtools/ash_devtools_dom_agent.h" | 14 #include "ash/devtools/ash_devtools_dom_agent.h" | 
| 15 #include "ash/common/focus_cycler.h" | 15 #include "ash/focus_cycler.h" | 
| 16 #include "ash/common/keyboard/keyboard_ui.h" | 16 #include "ash/keyboard/keyboard_ui.h" | 
| 17 #include "ash/common/media_controller.h" | 17 #include "ash/media_controller.h" | 
| 18 #include "ash/common/new_window_controller.h" | 18 #include "ash/new_window_controller.h" | 
| 19 #include "ash/common/palette_delegate.h" | 19 #include "ash/palette_delegate.h" | 
| 20 #include "ash/common/session/session_controller.h" |  | 
| 21 #include "ash/common/session/session_state_delegate.h" |  | 
| 22 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |  | 
| 23 #include "ash/common/shelf/shelf_controller.h" |  | 
| 24 #include "ash/common/shelf/shelf_delegate.h" |  | 
| 25 #include "ash/common/shelf/shelf_model.h" |  | 
| 26 #include "ash/common/shelf/shelf_window_watcher.h" |  | 
| 27 #include "ash/common/shell_delegate.h" |  | 
| 28 #include "ash/common/shutdown_controller.h" |  | 
| 29 #include "ash/common/wallpaper/wallpaper_controller.h" |  | 
| 30 #include "ash/common/wallpaper/wallpaper_delegate.h" |  | 
| 31 #include "ash/common/wm/immersive_context_ash.h" |  | 
| 32 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |  | 
| 33 #include "ash/common/wm/mru_window_tracker.h" |  | 
| 34 #include "ash/common/wm/overview/window_selector_controller.h" |  | 
| 35 #include "ash/common/wm/root_window_finder.h" |  | 
| 36 #include "ash/common/wm/system_modal_container_layout_manager.h" |  | 
| 37 #include "ash/common/wm/window_cycle_controller.h" |  | 
| 38 #include "ash/common/wm_activation_observer.h" |  | 
| 39 #include "ash/common/wm_window.h" |  | 
| 40 #include "ash/public/cpp/shell_window_ids.h" | 20 #include "ash/public/cpp/shell_window_ids.h" | 
| 41 #include "ash/root_window_controller.h" | 21 #include "ash/root_window_controller.h" | 
|  | 22 #include "ash/session/session_controller.h" | 
|  | 23 #include "ash/session/session_state_delegate.h" | 
|  | 24 #include "ash/shelf/app_list_shelf_item_delegate.h" | 
|  | 25 #include "ash/shelf/shelf_controller.h" | 
|  | 26 #include "ash/shelf/shelf_delegate.h" | 
|  | 27 #include "ash/shelf/shelf_model.h" | 
|  | 28 #include "ash/shelf/shelf_window_watcher.h" | 
| 42 #include "ash/shell.h" | 29 #include "ash/shell.h" | 
|  | 30 #include "ash/shell_delegate.h" | 
|  | 31 #include "ash/shutdown_controller.h" | 
| 43 #include "ash/system/brightness/brightness_controller_chromeos.h" | 32 #include "ash/system/brightness/brightness_controller_chromeos.h" | 
| 44 #include "ash/system/brightness_control_delegate.h" | 33 #include "ash/system/brightness_control_delegate.h" | 
| 45 #include "ash/system/keyboard_brightness_control_delegate.h" | 34 #include "ash/system/keyboard_brightness_control_delegate.h" | 
| 46 #include "ash/system/keyboard_brightness_controller.h" | 35 #include "ash/system/keyboard_brightness_controller.h" | 
| 47 #include "ash/system/locale/locale_notification_controller.h" | 36 #include "ash/system/locale/locale_notification_controller.h" | 
| 48 #include "ash/system/network/vpn_list.h" | 37 #include "ash/system/network/vpn_list.h" | 
| 49 #include "ash/system/session/logout_confirmation_controller.h" | 38 #include "ash/system/session/logout_confirmation_controller.h" | 
| 50 #include "ash/system/toast/toast_manager.h" | 39 #include "ash/system/toast/toast_manager.h" | 
| 51 #include "ash/system/tray/system_tray_controller.h" | 40 #include "ash/system/tray/system_tray_controller.h" | 
| 52 #include "ash/system/tray/system_tray_delegate.h" | 41 #include "ash/system/tray/system_tray_delegate.h" | 
| 53 #include "ash/system/tray/system_tray_notifier.h" | 42 #include "ash/system/tray/system_tray_notifier.h" | 
|  | 43 #include "ash/wallpaper/wallpaper_controller.h" | 
|  | 44 #include "ash/wallpaper/wallpaper_delegate.h" | 
|  | 45 #include "ash/wm/immersive_context_ash.h" | 
|  | 46 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 
|  | 47 #include "ash/wm/mru_window_tracker.h" | 
|  | 48 #include "ash/wm/overview/window_selector_controller.h" | 
|  | 49 #include "ash/wm/root_window_finder.h" | 
|  | 50 #include "ash/wm/system_modal_container_layout_manager.h" | 
|  | 51 #include "ash/wm/window_cycle_controller.h" | 
|  | 52 #include "ash/wm_activation_observer.h" | 
|  | 53 #include "ash/wm_window.h" | 
| 54 #include "base/bind.h" | 54 #include "base/bind.h" | 
| 55 #include "base/logging.h" | 55 #include "base/logging.h" | 
| 56 #include "base/memory/ptr_util.h" | 56 #include "base/memory/ptr_util.h" | 
| 57 #include "base/threading/sequenced_worker_pool.h" | 57 #include "base/threading/sequenced_worker_pool.h" | 
| 58 #include "services/preferences/public/cpp/pref_client_store.h" | 58 #include "services/preferences/public/cpp/pref_client_store.h" | 
| 59 #include "services/preferences/public/interfaces/preferences.mojom.h" | 59 #include "services/preferences/public/interfaces/preferences.mojom.h" | 
| 60 #include "services/service_manager/public/cpp/connector.h" | 60 #include "services/service_manager/public/cpp/connector.h" | 
| 61 #include "ui/app_list/presenter/app_list.h" | 61 #include "ui/app_list/presenter/app_list.h" | 
| 62 #include "ui/display/display.h" | 62 #include "ui/display/display.h" | 
| 63 #include "ui/views/focus/focus_manager_factory.h" | 63 #include "ui/views/focus/focus_manager_factory.h" | 
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 461 | 461 | 
| 462 void WmShell::OnAttemptToReactivateWindow(aura::Window* request_active, | 462 void WmShell::OnAttemptToReactivateWindow(aura::Window* request_active, | 
| 463                                           aura::Window* actual_active) { | 463                                           aura::Window* actual_active) { | 
| 464   for (auto& observer : activation_observers_) { | 464   for (auto& observer : activation_observers_) { | 
| 465     observer.OnAttemptToReactivateWindow(WmWindow::Get(request_active), | 465     observer.OnAttemptToReactivateWindow(WmWindow::Get(request_active), | 
| 466                                          WmWindow::Get(actual_active)); | 466                                          WmWindow::Get(actual_active)); | 
| 467   } | 467   } | 
| 468 } | 468 } | 
| 469 | 469 | 
| 470 }  // namespace ash | 470 }  // namespace ash | 
| OLD | NEW | 
|---|