ui/aura/client/aura_constants.cc - Issue 2502413005: Use aura::WindowProperty for title and name strings.

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

Issue 2502413005: Use aura::WindowProperty for title and name strings. (Closed)

Patch Set: Update comment 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/client/aura_constants.h ('k') | ui/aura/window.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, base::string16*)

11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType)	12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType)

12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*)	13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*)

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

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

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

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

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

18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor)	19 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, int32_t)

20 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int64_t)	21 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int64_t)

(...skipping 10 matching lines...) Expand all Loading...
31 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0);	32 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0);

32 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false);	33 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false);

33 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false);	34 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false);

34 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true);	35 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true);

35 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false);	36 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false);

36 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false);	37 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false);

37 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false);	38 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false);

38 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false);	39 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false);

39 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr);	40 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr);

40 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);	41 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);

	42 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kNameKey, nullptr);

41 // gfx::Rect object for RestoreBoundsKey property is owned by the window	43 // gfx::Rect object for RestoreBoundsKey property is owned by the window

42 // and will be freed automatically.	44 // and will be freed automatically.

43 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr);	45 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr);

44 DEFINE_WINDOW_PROPERTY_KEY(	46 DEFINE_WINDOW_PROPERTY_KEY(

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

46 DEFINE_WINDOW_PROPERTY_KEY(	48 DEFINE_WINDOW_PROPERTY_KEY(

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

	50 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr);

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

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

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

51	54

52 } // namespace client	55 } // namespace client

53 } // namespace aura	56 } // namespace aura

OLD	NEW