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/wm/public/activation_delegate.h" | 5 #include "ui/wm/public/activation_delegate.h" |
6 | 6 |
7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
8 #include "ui/aura/window_property.h" | 8 #include "ui/base/class_property.h" |
9 | 9 |
10 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ActivationDelegate*) | 10 DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::ActivationDelegate*) |
11 | 11 |
12 namespace aura { | 12 namespace aura { |
13 namespace client { | 13 namespace client { |
14 | 14 |
15 DEFINE_LOCAL_WINDOW_PROPERTY_KEY( | 15 DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY( |
16 ActivationDelegate*, kActivationDelegateKey, NULL); | 16 ActivationDelegate*, kActivationDelegateKey, NULL); |
17 | 17 |
18 void SetActivationDelegate(Window* window, ActivationDelegate* delegate) { | 18 void SetActivationDelegate(Window* window, ActivationDelegate* delegate) { |
19 window->SetProperty(kActivationDelegateKey, delegate); | 19 window->SetProperty(kActivationDelegateKey, delegate); |
20 } | 20 } |
21 | 21 |
22 ActivationDelegate* GetActivationDelegate(Window* window) { | 22 ActivationDelegate* GetActivationDelegate(Window* window) { |
23 return window->GetProperty(kActivationDelegateKey); | 23 return window->GetProperty(kActivationDelegateKey); |
24 } | 24 } |
25 | 25 |
26 } // namespace client | 26 } // namespace client |
27 } // namespace aura | 27 } // namespace aura |
OLD | NEW |