ui/aura/client/aura_constants.cc - Issue 2499933003: Expand aura::PropertyConverter support.

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

Issue 2499933003: Expand aura::PropertyConverter support. (Closed)

Patch Set: Fix the other new unit test. Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « ui/aura/BUILD.gn ('k') | ui/aura/mus/property_converter.h » ('j') | no next file with comments »

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/geometry/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::ImageSkia*)	12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*)

13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)	13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)

14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*)	14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*)

15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)	15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)

16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)	16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)

17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int)

18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*)	17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*)

19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor)	18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor)

	19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int32_t)

	20 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int64_t)

20	21

21 namespace aura {	22 namespace aura {

22 namespace client {	23 namespace client {

23	24

24 // Alphabetical sort.	25 // Alphabetical sort.

25	26

26 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);	27 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);

27 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);	28 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);

28 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr);	29 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr);

29 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kAppIdKey, nullptr);	30 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kAppIdKey, nullptr);

(...skipping 13 matching lines...) Expand all Loading...
43 DEFINE_WINDOW_PROPERTY_KEY(	44 DEFINE_WINDOW_PROPERTY_KEY(

44 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);	45 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);

45 DEFINE_WINDOW_PROPERTY_KEY(	46 DEFINE_WINDOW_PROPERTY_KEY(

46 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT);	47 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT);

47 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0);	48 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0);

48 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);	49 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);

49 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);	50 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);

50	51

51 } // namespace client	52 } // namespace client

52 } // namespace aura	53 } // namespace aura

OLD	NEW