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

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

Issue 2778733004: Add WindowPinType property on arua::Window (Closed)
Patch Set: Address review issues. Created 3 years, 8 months 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/base/class_property.h" 8 #include "ui/base/class_property.h"
9 #include "ui/gfx/geometry/rect.h" 9 #include "ui/gfx/geometry/rect.h"
10 10
11 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, bool) 11 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, bool)
12 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, base::string16*) 12 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, base::string16*)
13 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) 13 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType)
14 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) 14 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*)
15 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) 15 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)
16 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::Size*) 16 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::Size*)
17 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, std::string*) 17 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, std::string*)
18 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) 18 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)
19 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::mojom::WindowType); 19 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::mojom::WindowType);
20 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, void*) 20 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, void*)
21 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, SkColor) 21 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, SkColor)
22 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, int32_t) 22 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, int32_t)
23 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, int64_t) 23 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, int64_t)
24 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, 24 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT,
25 aura::client::WindowEmbedType) 25 aura::client::WindowEmbedType)
26 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT,
27 aura::client::WindowPinType)
26 28
27 namespace aura { 29 namespace aura {
28 namespace client { 30 namespace client {
29 31
30 // Alphabetical sort. 32 // Alphabetical sort.
31 33
32 DEFINE_UI_CLASS_PROPERTY_KEY( 34 DEFINE_UI_CLASS_PROPERTY_KEY(
33 bool, kAccessibilityFocusFallsbackToWidgetKey, true); 35 bool, kAccessibilityFocusFallsbackToWidgetKey, true);
34 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); 36 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);
35 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); 37 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);
(...skipping 19 matching lines...) Expand all
55 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, 57 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t,
56 kResizeBehaviorKey, 58 kResizeBehaviorKey,
57 ui::mojom::kResizeBehaviorCanResize); 59 ui::mojom::kResizeBehaviorCanResize);
58 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); 60 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr);
59 DEFINE_UI_CLASS_PROPERTY_KEY( 61 DEFINE_UI_CLASS_PROPERTY_KEY(
60 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); 62 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT);
61 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); 63 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr);
62 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); 64 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0);
63 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); 65 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);
64 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); 66 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);
67 DEFINE_UI_CLASS_PROPERTY_KEY(WindowPinType,
68 kWindowPinTypeKey,
69 WindowPinType::NONE);
65 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, 70 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType,
66 kWindowTypeKey, 71 kWindowTypeKey,
67 ui::mojom::WindowType::UNKNOWN); 72 ui::mojom::WindowType::UNKNOWN);
68 73
69 } // namespace client 74 } // namespace client
70 } // namespace aura 75 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698