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

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

Issue 2632543003: Refactor and push window properties up to class properties. (Closed)
Patch Set: More build fixes Created 3 years, 10 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
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
(...skipping 27 matching lines...) Expand all
38 #include "services/ui/common/types.h" 38 #include "services/ui/common/types.h"
39 #include "services/ui/public/cpp/property_type_converters.h" 39 #include "services/ui/public/cpp/property_type_converters.h"
40 #include "services/ui/public/interfaces/constants.mojom.h" 40 #include "services/ui/public/interfaces/constants.mojom.h"
41 #include "services/ui/public/interfaces/window_manager.mojom.h" 41 #include "services/ui/public/interfaces/window_manager.mojom.h"
42 #include "ui/aura/client/window_parenting_client.h" 42 #include "ui/aura/client/window_parenting_client.h"
43 #include "ui/aura/env.h" 43 #include "ui/aura/env.h"
44 #include "ui/aura/mus/property_converter.h" 44 #include "ui/aura/mus/property_converter.h"
45 #include "ui/aura/mus/window_tree_client.h" 45 #include "ui/aura/mus/window_tree_client.h"
46 #include "ui/aura/mus/window_tree_host_mus.h" 46 #include "ui/aura/mus/window_tree_host_mus.h"
47 #include "ui/aura/window.h" 47 #include "ui/aura/window.h"
48 #include "ui/aura/window_property.h" 48 #include "ui/base/class_property.h"
49 #include "ui/base/hit_test.h" 49 #include "ui/base/hit_test.h"
50 #include "ui/display/display_observer.h" 50 #include "ui/display/display_observer.h"
51 #include "ui/events/mojo/event.mojom.h" 51 #include "ui/events/mojo/event.mojom.h"
52 #include "ui/views/mus/pointer_watcher_event_router.h" 52 #include "ui/views/mus/pointer_watcher_event_router.h"
53 #include "ui/views/mus/screen_mus.h" 53 #include "ui/views/mus/screen_mus.h"
54 #include "ui/wm/core/capture_controller.h" 54 #include "ui/wm/core/capture_controller.h"
55 #include "ui/wm/core/wm_state.h" 55 #include "ui/wm/core/wm_state.h"
56 #include "ui/wm/public/activation_client.h" 56 #include "ui/wm/public/activation_client.h"
57 57
58 namespace ash { 58 namespace ash {
(...skipping 396 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/shadow.cc ('k') | ash/mus/window_properties.cc » ('j') | ui/base/class_property.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698