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::internal::RootWindowSettings*); |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 namespace internal { | 14 namespace internal { |
15 | 15 |
16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, | 16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings, |
17 kRootWindowSettingsKey, NULL); | 17 kRootWindowSettingsKey, NULL); |
18 | 18 |
19 RootWindowSettings::RootWindowSettings() | 19 RootWindowSettings::RootWindowSettings() |
20 : display_id(gfx::Display::kInvalidDisplayID), | 20 : display_id(gfx::Display::kInvalidDisplayID), |
21 controller(NULL) { | 21 controller(NULL), |
| 22 shutdown(false) { |
22 } | 23 } |
23 | 24 |
24 RootWindowSettings* InitRootWindowSettings(aura::Window* root) { | 25 RootWindowSettings* InitRootWindowSettings(aura::Window* root) { |
25 RootWindowSettings* settings = new RootWindowSettings(); | 26 RootWindowSettings* settings = new RootWindowSettings(); |
26 root->SetProperty(kRootWindowSettingsKey, settings); | 27 root->SetProperty(kRootWindowSettingsKey, settings); |
27 return settings; | 28 return settings; |
28 } | 29 } |
29 | 30 |
30 RootWindowSettings* GetRootWindowSettings(aura::Window* root) { | 31 RootWindowSettings* GetRootWindowSettings(aura::Window* root) { |
31 return root->GetProperty(kRootWindowSettingsKey); | 32 return root->GetProperty(kRootWindowSettingsKey); |
32 } | 33 } |
33 | 34 |
34 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) { | 35 const RootWindowSettings* GetRootWindowSettings(const aura::Window* root) { |
35 return root->GetProperty(kRootWindowSettingsKey); | 36 return root->GetProperty(kRootWindowSettingsKey); |
36 } | 37 } |
37 | 38 |
38 } // namespace internal | 39 } // namespace internal |
39 } // namespace ash | 40 } // namespace ash |
OLD | NEW |