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

Side by Side Diff: ui/aura/client/window_tree_client.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ui/aura/client/focus_client.cc ('k') | ui/aura/root_window.h » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/aura/client/window_tree_client.h" 5 #include "ui/aura/client/window_tree_client.h"
6 6
7 #include "ui/aura/env.h" 7 #include "ui/aura/env.h"
8 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
9 #include "ui/aura/window_property.h" 9 #include "ui/aura/window_property.h"
10 10
11 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowTreeClient*) 11 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowTreeClient*)
12 12
13 namespace aura { 13 namespace aura {
14 namespace client { 14 namespace client {
15 15
16 DEFINE_WINDOW_PROPERTY_KEY( 16 DEFINE_WINDOW_PROPERTY_KEY(
17 WindowTreeClient*, kRootWindowWindowTreeClientKey, NULL); 17 WindowTreeClient*, kRootWindowWindowTreeClientKey, NULL);
18 18
19 void SetWindowTreeClient(Window* window, WindowTreeClient* window_tree_client) { 19 void SetWindowTreeClient(Window* window, WindowTreeClient* window_tree_client) {
20 DCHECK(window); 20 DCHECK(window);
21 21
22 RootWindow* root_window = window->GetRootWindow(); 22 Window* root_window = window->GetRootWindow();
23 DCHECK(root_window); 23 DCHECK(root_window);
24 root_window->SetProperty(kRootWindowWindowTreeClientKey, window_tree_client); 24 root_window->SetProperty(kRootWindowWindowTreeClientKey, window_tree_client);
25 } 25 }
26 26
27 WindowTreeClient* GetWindowTreeClient(Window* window) { 27 WindowTreeClient* GetWindowTreeClient(Window* window) {
28 DCHECK(window); 28 DCHECK(window);
29 RootWindow* root_window = window->GetRootWindow(); 29 Window* root_window = window->GetRootWindow();
30 DCHECK(root_window); 30 DCHECK(root_window);
31 WindowTreeClient* client = 31 WindowTreeClient* client =
32 root_window->GetProperty(kRootWindowWindowTreeClientKey); 32 root_window->GetProperty(kRootWindowWindowTreeClientKey);
33 DCHECK(client); 33 DCHECK(client);
34 return client; 34 return client;
35 } 35 }
36 36
37 void ParentWindowWithContext(Window* window, 37 void ParentWindowWithContext(Window* window,
38 Window* context, 38 Window* context,
39 const gfx::Rect& screen_bounds) { 39 const gfx::Rect& screen_bounds) {
40 DCHECK(context); 40 DCHECK(context);
41 41
42 // |context| must be attached to a hierarchy with a WindowTreeClient. 42 // |context| must be attached to a hierarchy with a WindowTreeClient.
43 WindowTreeClient* client = GetWindowTreeClient(context); 43 WindowTreeClient* client = GetWindowTreeClient(context);
44 DCHECK(client); 44 DCHECK(client);
45 Window* default_parent = 45 Window* default_parent =
46 client->GetDefaultParent(context, window, screen_bounds); 46 client->GetDefaultParent(context, window, screen_bounds);
47 default_parent->AddChild(window); 47 default_parent->AddChild(window);
48 } 48 }
49 49
50 } // namespace client 50 } // namespace client
51 } // namespace aura 51 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/focus_client.cc ('k') | ui/aura/root_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698