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

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

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura Created 8 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/stacking_client.h ('k') | ui/aura/demo/demo_main.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/stacking_client.h" 5 #include "ui/aura/client/stacking_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::StackingClient*) 11 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::StackingClient*)
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 StackingClient*, kRootWindowStackingClientKey, NULL); 17 StackingClient*, kRootWindowStackingClientKey, NULL);
18 18
19 void SetStackingClient(StackingClient* stacking_client) { 19 void SetStackingClient(StackingClient* stacking_client) {
20 Env::GetInstance()->set_stacking_client(stacking_client); 20 Env::GetInstance()->set_stacking_client(stacking_client);
21 } 21 }
22 22
23 StackingClient* GetStackingClient() { 23 StackingClient* GetStackingClient() {
24 return Env::GetInstance()->stacking_client(); 24 return Env::GetInstance()->stacking_client();
25 } 25 }
26 26
27 void SetStackingClient(Window* window, StackingClient* stacking_client) {
28 if (window) {
29 RootWindow* root_window = window->GetRootWindow();
30 DCHECK(root_window);
31 root_window->SetProperty(kRootWindowStackingClientKey, stacking_client);
32 } else {
33 SetStackingClient(stacking_client);
34 }
35 }
36
37 StackingClient* GetStackingClient(Window* window) {
38 if (window) {
39 RootWindow* root_window = window->GetRootWindow();
40 DCHECK(root_window);
41 StackingClient* root_window_stacking_client =
42 root_window->GetProperty(kRootWindowStackingClientKey);
43 if (root_window_stacking_client)
44 return root_window_stacking_client;
45 }
46 return GetStackingClient();
47 }
48
49 } // namespace client 27 } // namespace client
50 } // namespace aura 28 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/stacking_client.h ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698