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/aura/client/aura_constants.h" | 5 #include "ui/aura/client/aura_constants.h" |
6 | 6 |
7 #include "ui/aura/window_property.h" | 7 #include "ui/aura/window_property.h" |
8 #include "ui/gfx/rect.h" | 8 #include "ui/gfx/geometry/rect.h" |
9 | 9 |
10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) | 10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) |
11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) | 11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) |
12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) | 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) |
13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) | 13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) |
14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) | 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
15 | 15 |
16 namespace aura { | 16 namespace aura { |
17 namespace client { | 17 namespace client { |
18 | 18 |
(...skipping 12 matching lines...) Expand all Loading... |
31 // and will be freed automatically. | 31 // and will be freed automatically. |
32 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL); | 32 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL); |
33 DEFINE_WINDOW_PROPERTY_KEY( | 33 DEFINE_WINDOW_PROPERTY_KEY( |
34 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 34 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
35 DEFINE_WINDOW_PROPERTY_KEY(ui::InputMethod*, kRootWindowInputMethodKey, NULL); | 35 DEFINE_WINDOW_PROPERTY_KEY(ui::InputMethod*, kRootWindowInputMethodKey, NULL); |
36 DEFINE_WINDOW_PROPERTY_KEY( | 36 DEFINE_WINDOW_PROPERTY_KEY( |
37 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 37 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
38 | 38 |
39 } // namespace client | 39 } // namespace client |
40 } // namespace aura | 40 } // namespace aura |
OLD | NEW |