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_change_observer.h" | 5 #include "ui/wm/public/activation_change_observer.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::ActivationChangeObserver*) | 10 DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::ActivationChangeObserver*) |
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 ActivationChangeObserver*, kActivationChangeObserverKey, NULL); | 16 ActivationChangeObserver*, kActivationChangeObserverKey, NULL); |
17 | 17 |
18 void SetActivationChangeObserver( | 18 void SetActivationChangeObserver( |
19 Window* window, | 19 Window* window, |
20 ActivationChangeObserver* observer) { | 20 ActivationChangeObserver* observer) { |
21 window->SetProperty(kActivationChangeObserverKey, observer); | 21 window->SetProperty(kActivationChangeObserverKey, observer); |
22 } | 22 } |
23 | 23 |
24 ActivationChangeObserver* GetActivationChangeObserver(Window* window) { | 24 ActivationChangeObserver* GetActivationChangeObserver(Window* window) { |
25 return window ? window->GetProperty(kActivationChangeObserverKey) : NULL; | 25 return window ? window->GetProperty(kActivationChangeObserverKey) : NULL; |
26 } | 26 } |
27 | 27 |
28 } // namespace client | 28 } // namespace client |
29 } // namespace aura | 29 } // namespace aura |
OLD | NEW |