Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: ui/aura/client/aura_constants.cc

Issue 2538633002: Adds a couple more properties to the property converter (Closed)
Patch Set: cleanup Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "services/ui/public/interfaces/window_manager_constants.mojom.h" 7 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
8 #include "ui/aura/window_property.h" 8 #include "ui/aura/window_property.h"
9 #include "ui/gfx/geometry/rect.h" 9 #include "ui/gfx/geometry/rect.h"
10 10
11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) 11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)
12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, base::string16*) 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, base::string16*)
13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) 13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType)
14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*)
15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)
16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Size*)
16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*) 17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*)
17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)
18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) 18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)
19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::mojom::WindowType); 19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::mojom::WindowType);
20 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) 20 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*)
21 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) 21 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor)
22 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int32_t) 22 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int32_t)
23 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int64_t) 23 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int64_t)
24 24
25 namespace aura { 25 namespace aura {
26 namespace client { 26 namespace client {
27 27
28 // Alphabetical sort. 28 // Alphabetical sort.
29 29
30 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); 30 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);
31 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); 31 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);
32 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr); 32 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr);
33 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kAppIdKey, nullptr); 33 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kAppIdKey, nullptr);
34 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0); 34 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0);
35 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); 35 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false);
36 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false); 36 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false);
37 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); 37 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true);
38 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); 38 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false);
39 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); 39 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false);
40 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false); 40 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false);
41 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); 41 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false);
42 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); 42 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr);
43 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); 43 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);
44 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kNameKey, nullptr); 44 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kNameKey, nullptr);
45 // gfx::Rect object for RestoreBoundsKey property is owned by the window 45 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr);
46 // and will be freed automatically. 46 DEFINE_WINDOW_PROPERTY_KEY(int32_t,
47 kResizeBehaviorKey,
48 ui::mojom::kResizeBehaviorNone);
47 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); 49 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr);
48 DEFINE_WINDOW_PROPERTY_KEY( 50 DEFINE_WINDOW_PROPERTY_KEY(
49 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); 51 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
50 DEFINE_WINDOW_PROPERTY_KEY( 52 DEFINE_WINDOW_PROPERTY_KEY(
51 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); 53 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT);
52 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); 54 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr);
53 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); 55 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0);
54 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); 56 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);
55 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); 57 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);
56 DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType, 58 DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType,
57 kWindowTypeKey, 59 kWindowTypeKey,
58 ui::mojom::WindowType::UNKNOWN); 60 ui::mojom::WindowType::UNKNOWN);
59 61
60 } // namespace client 62 } // namespace client
61 } // namespace aura 63 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698