OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/root_window_settings.h" | 5 #include "ash/root_window_settings.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/aura/window_property.h" |
9 #include "ui/gfx/display.h" | 9 #include "ui/gfx/display.h" |
10 | 10 |
11 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowSettings*); | 11 DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*); |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 namespace internal { | |
15 | 14 |
16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, | 15 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, |
17 kRootWindowSettingsKey, NULL); | 16 kRootWindowSettingsKey, NULL); |
18 | 17 |
19 RootWindowSettings::RootWindowSettings() | 18 RootWindowSettings::RootWindowSettings() |
20 : display_id(gfx::Display::kInvalidDisplayID), | 19 : display_id(gfx::Display::kInvalidDisplayID), |
21 controller(NULL), | 20 controller(NULL), |
22 shutdown(false) { | 21 shutdown(false) { |
23 } | 22 } |
24 | 23 |
25 RootWindowSettings* InitRootWindowSettings(aura::Window* root) { | 24 RootWindowSettings* InitRootWindowSettings(aura::Window* root) { |
26 RootWindowSettings* settings = new RootWindowSettings(); | 25 RootWindowSettings* settings = new RootWindowSettings(); |
27 root->SetProperty(kRootWindowSettingsKey, settings); | 26 root->SetProperty(kRootWindowSettingsKey, settings); |
28 return settings; | 27 return settings; |
29 } | 28 } |
30 | 29 |
31 RootWindowSettings* GetRootWindowSettings(aura::Window* root) { | 30 RootWindowSettings* GetRootWindowSettings(aura::Window* root) { |
32 return root->GetProperty(kRootWindowSettingsKey); | 31 return root->GetProperty(kRootWindowSettingsKey); |
33 } | 32 } |
34 | 33 |
35 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) { | 34 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) { |
36 return root->GetProperty(kRootWindowSettingsKey); | 35 return root->GetProperty(kRootWindowSettingsKey); |
37 } | 36 } |
38 | 37 |
39 } // namespace internal | |
40 } // namespace ash | 38 } // namespace ash |
OLD | NEW |