OLD | NEW |
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/event_client.h" | 5 #include "ui/aura/client/event_client.h" |
6 | 6 |
| 7 #include "ui/aura/window.h" |
7 #include "ui/aura/window_event_dispatcher.h" | 8 #include "ui/aura/window_event_dispatcher.h" |
8 #include "ui/aura/window_property.h" | 9 #include "ui/base/class_property.h" |
9 | 10 |
10 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::EventClient*) | 11 DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::EventClient*) |
11 | 12 |
12 namespace aura { | 13 namespace aura { |
13 namespace client { | 14 namespace client { |
14 | 15 |
15 DEFINE_WINDOW_PROPERTY_KEY(EventClient*, kRootWindowEventClientKey, NULL); | 16 DEFINE_UI_CLASS_PROPERTY_KEY(EventClient*, kRootWindowEventClientKey, NULL); |
16 | 17 |
17 void SetEventClient(Window* root_window, EventClient* client) { | 18 void SetEventClient(Window* root_window, EventClient* client) { |
18 DCHECK_EQ(root_window->GetRootWindow(), root_window); | 19 DCHECK_EQ(root_window->GetRootWindow(), root_window); |
19 root_window->SetProperty(kRootWindowEventClientKey, client); | 20 root_window->SetProperty(kRootWindowEventClientKey, client); |
20 } | 21 } |
21 | 22 |
22 EventClient* GetEventClient(const Window* root_window) { | 23 EventClient* GetEventClient(const Window* root_window) { |
23 if (root_window) | 24 if (root_window) |
24 DCHECK_EQ(root_window->GetRootWindow(), root_window); | 25 DCHECK_EQ(root_window->GetRootWindow(), root_window); |
25 return root_window ? | 26 return root_window ? |
26 root_window->GetProperty(kRootWindowEventClientKey) : NULL; | 27 root_window->GetProperty(kRootWindowEventClientKey) : NULL; |
27 } | 28 } |
28 | 29 |
29 } // namespace client | 30 } // namespace client |
30 } // namespace aura | 31 } // namespace aura |
OLD | NEW |