ui/aura/client/aura_constants.cc - Issue 1155013005: Refactoring the ownership of ui::InputMethod.

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed bot failure: cast_shell_linux Created 5 years, 6 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

« no previous file with comments | « ui/aura/client/aura_constants.h ('k') | ui/aura/remote_window_tree_host_win.h » ('j') | ui/aura/window_tree_host.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 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)	10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool)

(...skipping 16 matching lines...) Expand all Loading...
27 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true);	27 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true);

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

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

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

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

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

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

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

35 DEFINE_WINDOW_PROPERTY_KEY(	35 DEFINE_WINDOW_PROPERTY_KEY(

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

37 DEFINE_WINDOW_PROPERTY_KEY(ui::InputMethod*, kRootWindowInputMethodKey, NULL);

38 DEFINE_WINDOW_PROPERTY_KEY(	37 DEFINE_WINDOW_PROPERTY_KEY(

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

40	39

41 } // namespace client	40 } // namespace client

42 } // namespace aura	41 } // namespace aura

OLD	NEW