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/focus_client.h" | 5 #include "ui/aura/client/focus_client.h" |
6 | 6 |
7 #include "ui/aura/window_event_dispatcher.h" | 7 #include "ui/aura/window_event_dispatcher.h" |
8 #include "ui/aura/window_property.h" | 8 #include "ui/base/class_property.h" |
9 | 9 |
10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::client::FocusClient*) | 10 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, aura::client::FocusClient*) |
11 | 11 |
12 namespace aura { | 12 namespace aura { |
13 namespace client { | 13 namespace client { |
14 | 14 |
15 DEFINE_WINDOW_PROPERTY_KEY(FocusClient*, kFocusClientKey, nullptr); | 15 DEFINE_UI_CLASS_PROPERTY_KEY(FocusClient*, kFocusClientKey, nullptr); |
16 | 16 |
17 void SetFocusClient(Window* root_window, FocusClient* client) { | 17 void SetFocusClient(Window* root_window, FocusClient* client) { |
18 DCHECK_EQ(root_window->GetRootWindow(), root_window); | 18 DCHECK_EQ(root_window->GetRootWindow(), root_window); |
19 root_window->SetProperty(kFocusClientKey, client); | 19 root_window->SetProperty(kFocusClientKey, client); |
20 } | 20 } |
21 | 21 |
22 FocusClient* GetFocusClient(Window* window) { | 22 FocusClient* GetFocusClient(Window* window) { |
23 return GetFocusClient(static_cast<const Window*>(window)); | 23 return GetFocusClient(static_cast<const Window*>(window)); |
24 } | 24 } |
25 | 25 |
26 FocusClient* GetFocusClient(const Window* window) { | 26 FocusClient* GetFocusClient(const Window* window) { |
27 const Window* root_window = window->GetRootWindow(); | 27 const Window* root_window = window->GetRootWindow(); |
28 return root_window ? root_window->GetProperty(kFocusClientKey) : nullptr; | 28 return root_window ? root_window->GetProperty(kFocusClientKey) : nullptr; |
29 } | 29 } |
30 | 30 |
31 } // namespace client | 31 } // namespace client |
32 } // namespace aura | 32 } // namespace aura |
OLD | NEW |