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/display/display.h" | 9 #include "ui/display/display.h" |
10 | 10 |
11 DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*); | 11 DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*); |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 | 14 |
15 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, | 15 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, |
16 kRootWindowSettingsKey, NULL); | 16 kRootWindowSettingsKey, |
| 17 NULL); |
17 | 18 |
18 RootWindowSettings::RootWindowSettings() | 19 RootWindowSettings::RootWindowSettings() |
19 : display_id(display::Display::kInvalidDisplayID), controller(NULL) {} | 20 : display_id(display::Display::kInvalidDisplayID), controller(NULL) {} |
20 | 21 |
21 RootWindowSettings* InitRootWindowSettings(aura::Window* root) { | 22 RootWindowSettings* InitRootWindowSettings(aura::Window* root) { |
22 RootWindowSettings* settings = new RootWindowSettings(); | 23 RootWindowSettings* settings = new RootWindowSettings(); |
23 root->SetProperty(kRootWindowSettingsKey, settings); | 24 root->SetProperty(kRootWindowSettingsKey, settings); |
24 return settings; | 25 return settings; |
25 } | 26 } |
26 | 27 |
27 RootWindowSettings* GetRootWindowSettings(aura::Window* root) { | 28 RootWindowSettings* GetRootWindowSettings(aura::Window* root) { |
28 return root->GetProperty(kRootWindowSettingsKey); | 29 return root->GetProperty(kRootWindowSettingsKey); |
29 } | 30 } |
30 | 31 |
31 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) { | 32 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) { |
32 return root->GetProperty(kRootWindowSettingsKey); | 33 return root->GetProperty(kRootWindowSettingsKey); |
33 } | 34 } |
34 | 35 |
35 } // namespace ash | 36 } // namespace ash |
OLD | NEW |