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

Side by Side Diff: ash/mus/bridge/wm_root_window_controller_mus.cc

Issue 2624613002: Promotes common functions to WmRootWindowController (Closed)
Patch Set: order Created 3 years, 11 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/bridge/wm_root_window_controller_mus.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/mus/bridge/wm_root_window_controller_mus.h" 5 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
6 6
7 #include "ash/common/shelf/wm_shelf.h" 7 #include "ash/common/shelf/wm_shelf.h"
8 #include "ash/mus/bridge/wm_shell_mus.h" 8 #include "ash/mus/bridge/wm_shell_mus.h"
9 #include "ash/mus/bridge/wm_window_mus.h" 9 #include "ash/mus/bridge/wm_window_mus.h"
10 #include "ash/mus/root_window_controller.h" 10 #include "ash/mus/root_window_controller.h"
11 #include "ash/mus/window_manager.h" 11 #include "ash/mus/window_manager.h"
12 #include "ui/aura/mus/window_mus.h" 12 #include "ui/aura/mus/window_mus.h"
13 #include "ui/aura/mus/window_tree_client.h" 13 #include "ui/aura/mus/window_tree_client.h"
14 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
15 #include "ui/aura/window_property.h" 15 #include "ui/aura/window_property.h"
16 #include "ui/display/display.h" 16 #include "ui/display/display.h"
17 #include "ui/views/widget/widget.h"
18 17
19 DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WmRootWindowControllerMus*); 18 DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WmRootWindowControllerMus*);
20 19
21 namespace { 20 namespace {
22 21
23 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::WmRootWindowControllerMus*, 22 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::WmRootWindowControllerMus*,
24 kWmRootWindowControllerKey, 23 kWmRootWindowControllerKey,
25 nullptr); 24 nullptr);
26 25
27 } // namespace 26 } // namespace
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 78 }
80 79
81 WmShelf* WmRootWindowControllerMus::GetShelf() { 80 WmShelf* WmRootWindowControllerMus::GetShelf() {
82 return root_window_controller_->wm_shelf(); 81 return root_window_controller_->wm_shelf();
83 } 82 }
84 83
85 WmWindow* WmRootWindowControllerMus::GetWindow() { 84 WmWindow* WmRootWindowControllerMus::GetWindow() {
86 return WmWindowMus::Get(root_window_controller_->root()); 85 return WmWindowMus::Get(root_window_controller_->root());
87 } 86 }
88 87
89 void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(
90 views::Widget* widget,
91 int shell_container_id,
92 views::Widget::InitParams* init_params) {
93 init_params->parent = WmWindowMus::GetAuraWindow(
94 WmWindowMus::Get(root_window_controller_->root())
95 ->GetChildByShellWindowId(shell_container_id));
96 DCHECK(init_params->parent);
97 }
98
99 WmWindow* WmRootWindowControllerMus::FindEventTarget(
100 const gfx::Point& location_in_screen) {
101 NOTIMPLEMENTED();
102 return nullptr;
103 }
104
105 gfx::Point WmRootWindowControllerMus::GetLastMouseLocationInRoot() {
106 gfx::Point location = root_window_controller_->window_manager()
107 ->window_tree_client()
108 ->GetCursorScreenPoint();
109 location -=
110 root_window_controller_->display().bounds().origin().OffsetFromOrigin();
111 return location;
112 }
113
114 bool WmRootWindowControllerMus::ShouldDestroyWindowInCloseChildWindows( 88 bool WmRootWindowControllerMus::ShouldDestroyWindowInCloseChildWindows(
115 WmWindow* window) { 89 WmWindow* window) {
116 aura::WindowTreeClient* window_tree_client = 90 aura::WindowTreeClient* window_tree_client =
117 root_window_controller_->window_manager()->window_tree_client(); 91 root_window_controller_->window_manager()->window_tree_client();
118 aura::Window* aura_window = WmWindowMus::GetAuraWindow(window); 92 aura::Window* aura_window = WmWindowMus::GetAuraWindow(window);
119 aura::WindowMus* window_mus = aura::WindowMus::Get(aura_window); 93 aura::WindowMus* window_mus = aura::WindowMus::Get(aura_window);
120 return window_tree_client->WasCreatedByThisClient(window_mus) || 94 return window_tree_client->WasCreatedByThisClient(window_mus) ||
121 window_tree_client->IsRoot(window_mus); 95 window_tree_client->IsRoot(window_mus);
122 } 96 }
123 97
124 } // namespace mus 98 } // namespace mus
125 } // namespace ash 99 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698