Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Side by Side Diff: ash/mus/window_manager.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/mus/wallpaper_delegate_mus.h ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/mus/window_manager.h" 5 #include "ash/mus/window_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "ash/common/session/session_controller.h"
12 #include "ash/common/wm/container_finder.h"
13 #include "ash/common/wm/window_state.h"
14 #include "ash/common/wm_window.h"
15 #include "ash/mus/accelerators/accelerator_handler.h" 11 #include "ash/mus/accelerators/accelerator_handler.h"
16 #include "ash/mus/accelerators/accelerator_ids.h" 12 #include "ash/mus/accelerators/accelerator_ids.h"
17 #include "ash/mus/bridge/wm_shell_mus.h" 13 #include "ash/mus/bridge/wm_shell_mus.h"
18 #include "ash/mus/move_event_handler.h" 14 #include "ash/mus/move_event_handler.h"
19 #include "ash/mus/non_client_frame_controller.h" 15 #include "ash/mus/non_client_frame_controller.h"
20 #include "ash/mus/property_util.h" 16 #include "ash/mus/property_util.h"
21 #include "ash/mus/screen_mus.h" 17 #include "ash/mus/screen_mus.h"
22 #include "ash/mus/shell_delegate_mus.h" 18 #include "ash/mus/shell_delegate_mus.h"
23 #include "ash/mus/top_level_window_factory.h" 19 #include "ash/mus/top_level_window_factory.h"
24 #include "ash/mus/window_properties.h" 20 #include "ash/mus/window_properties.h"
25 #include "ash/public/cpp/shelf_types.h" 21 #include "ash/public/cpp/shelf_types.h"
26 #include "ash/public/cpp/shell_window_ids.h" 22 #include "ash/public/cpp/shell_window_ids.h"
27 #include "ash/public/cpp/window_properties.h" 23 #include "ash/public/cpp/window_properties.h"
28 #include "ash/root_window_controller.h" 24 #include "ash/root_window_controller.h"
29 #include "ash/root_window_settings.h" 25 #include "ash/root_window_settings.h"
26 #include "ash/session/session_controller.h"
30 #include "ash/shell.h" 27 #include "ash/shell.h"
31 #include "ash/shell_init_params.h" 28 #include "ash/shell_init_params.h"
32 #include "ash/wm/ash_focus_rules.h" 29 #include "ash/wm/ash_focus_rules.h"
30 #include "ash/wm/container_finder.h"
31 #include "ash/wm/window_state.h"
32 #include "ash/wm_window.h"
33 #include "base/memory/ptr_util.h" 33 #include "base/memory/ptr_util.h"
34 #include "base/threading/sequenced_worker_pool.h" 34 #include "base/threading/sequenced_worker_pool.h"
35 #include "services/service_manager/public/cpp/connector.h" 35 #include "services/service_manager/public/cpp/connector.h"
36 #include "services/ui/common/accelerator_util.h" 36 #include "services/ui/common/accelerator_util.h"
37 #include "services/ui/common/types.h" 37 #include "services/ui/common/types.h"
38 #include "services/ui/public/cpp/property_type_converters.h" 38 #include "services/ui/public/cpp/property_type_converters.h"
39 #include "services/ui/public/interfaces/constants.mojom.h" 39 #include "services/ui/public/interfaces/constants.mojom.h"
40 #include "services/ui/public/interfaces/window_manager.mojom.h" 40 #include "services/ui/public/interfaces/window_manager.mojom.h"
41 #include "ui/aura/client/window_parenting_client.h" 41 #include "ui/aura/client/window_parenting_client.h"
42 #include "ui/aura/env.h" 42 #include "ui/aura/env.h"
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 bool WindowManager::IsWindowActive(aura::Window* window) { 455 bool WindowManager::IsWindowActive(aura::Window* window) {
456 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window; 456 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window;
457 } 457 }
458 458
459 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { 459 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
460 Shell::GetInstance()->activation_client()->DeactivateWindow(window); 460 Shell::GetInstance()->activation_client()->DeactivateWindow(window);
461 } 461 }
462 462
463 } // namespace mus 463 } // namespace mus
464 } // namespace ash 464 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/wallpaper_delegate_mus.h ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698