ui/aura/client/aura_constants.cc - Issue 15114002: Reorder the NativeViews attached to a view via kViewHostKey according to the position of the view

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

Issue 15114002: Reorder the NativeViews attached to a view via kViewHostKey according to the position of the view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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 | Annotate | Revision Log

« chrome/browser/ui/views/dropdown_bar_host_aura.cc ('K') | « ui/aura/client/aura_constants.h ('k') | ui/views/controls/native/native_view_host_aura.cc » ('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/rect.h"	8 #include "ui/gfx/rect.h"

	9 #include "ui/views/view.h"
	sky 2013/05/13 15:53:14 This would introduce a cycle between aura->views a This would introduce a cycle between aura->views and views->aura . Can kHostViewKey be in views since that is the only place that needs it?
9	10

10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)	11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)

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::Rect*)	13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)

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

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

	16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, views::View*)

15	17

16 namespace aura {	18 namespace aura {

17 namespace client {	19 namespace client {

18	20

19 // Alphabetical sort.	21 // Alphabetical sort.

20	22

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

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

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

24 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true);	26 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true);

25 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false);	27 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false);

26 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false);	28 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false);

	29 DEFINE_WINDOW_PROPERTY_KEY(views::View*, kHostViewKey, NULL);

27 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);	30 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);

28 // gfx::Rect object for RestoreBoundsKey property is owned by the window	31 // gfx::Rect object for RestoreBoundsKey property is owned by the window

29 // and will be freed automatically.	32 // and will be freed automatically.

30 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL);	33 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL);

31 DEFINE_WINDOW_PROPERTY_KEY(	34 DEFINE_WINDOW_PROPERTY_KEY(

32 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);	35 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);

33 DEFINE_WINDOW_PROPERTY_KEY(ui::InputMethod*, kRootWindowInputMethodKey, NULL);	36 DEFINE_WINDOW_PROPERTY_KEY(ui::InputMethod*, kRootWindowInputMethodKey, NULL);

34 DEFINE_WINDOW_PROPERTY_KEY(	37 DEFINE_WINDOW_PROPERTY_KEY(

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

36	39

37 } // namespace client	40 } // namespace client

38 } // namespace aura	41 } // namespace aura

OLD	NEW