ui/aura/client/aura_constants.cc - Issue 1455793005: Adding a way to associate Android Activities with PlatformWindowAndroid

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

Issue 1455793005: Adding a way to associate Android Activities with PlatformWindowAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_native_widget

Patch Set: Getting rid of WindowTreeHostPlatformAndroid.java, just using a static method in PlatformWindowAndr… Created 5 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:

View unified diff | Download patch

« no previous file with comments | « ui/aura/client/aura_constants.h ('k') | ui/aura/window_tree_host_platform.cc » ('j') | ui/aura/window_tree_host_platform.cc » ('J')

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 #if defined(OS_ANDROID)

	11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, jobject);

	12 #endif

	13

10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)	14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)

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

12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)	16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)

13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)	17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)

14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)	18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)

15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int)	19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int)

16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*)	20 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*)

17	21

18 namespace aura {	22 namespace aura {

19 namespace client {	23 namespace client {

20	24

21 // Alphabetical sort.	25 // Alphabetical sort.

22	26

	27 #if defined(OS_ANDROID)

	28 DEFINE_WINDOW_PROPERTY_KEY(jobject, kActivityForRootWindow, nullptr);

	29 #endif

	30

23 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);	31 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);

24 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);	32 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);

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

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

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

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

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

30 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, NULL);	38 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, NULL);

31 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);	39 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);

32 // gfx::Rect object for RestoreBoundsKey property is owned by the window	40 // gfx::Rect object for RestoreBoundsKey property is owned by the window

33 // and will be freed automatically.	41 // and will be freed automatically.

34 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL);	42 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL);

35 DEFINE_WINDOW_PROPERTY_KEY(	43 DEFINE_WINDOW_PROPERTY_KEY(

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

37 DEFINE_WINDOW_PROPERTY_KEY(	45 DEFINE_WINDOW_PROPERTY_KEY(

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

39	47

40 } // namespace client	48 } // namespace client

41 } // namespace aura	49 } // namespace aura

OLD	NEW