Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

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

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: 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 | « no previous file | ui/aura/client/aura_constants.cc » ('j') | ui/aura/window_tree_host_platform.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef UI_AURA_CLIENT_AURA_CONSTANTS_H_ 5 #ifndef UI_AURA_CLIENT_AURA_CONSTANTS_H_
6 #define UI_AURA_CLIENT_AURA_CONSTANTS_H_ 6 #define UI_AURA_CLIENT_AURA_CONSTANTS_H_
7 7
8 #include "ui/aura/aura_export.h" 8 #include "ui/aura/aura_export.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/base/ui_base_types.h" 10 #include "ui/base/ui_base_types.h"
11 11
12 #if defined(OS_ANDROID)
13 #include "base/android/jni_android.h"
14 #endif
15
12 namespace ui { 16 namespace ui {
13 class InputMethod; 17 class InputMethod;
14 } 18 }
15 19
16 namespace aura { 20 namespace aura {
17 namespace client { 21 namespace client {
18 22
19 // Alphabetical sort. 23 // Alphabetical sort.
20 24
25 #if defined(OS_ANDROID)
26 // A property key to store Android Activity associated with the root window.
27 AURA_EXPORT extern const WindowProperty<jobject>* const kActivityForRootWindow;
mfomitchev 2015/11/19 20:57:05 Not sure if this is an appropriate place, but we'd
28 #endif
29
21 // A property key to store always-on-top flag. 30 // A property key to store always-on-top flag.
22 AURA_EXPORT extern const WindowProperty<bool>* const kAlwaysOnTopKey; 31 AURA_EXPORT extern const WindowProperty<bool>* const kAlwaysOnTopKey;
23 32
24 // A property key to store whether animations are disabled for the window. Type 33 // A property key to store whether animations are disabled for the window. Type
25 // of value is an int. 34 // of value is an int.
26 AURA_EXPORT extern const WindowProperty<bool>* const kAnimationsDisabledKey; 35 AURA_EXPORT extern const WindowProperty<bool>* const kAnimationsDisabledKey;
27 36
28 // A property key to store the can-maximize flag. 37 // A property key to store the can-maximize flag.
29 AURA_EXPORT extern const WindowProperty<bool>* const kCanMaximizeKey; 38 AURA_EXPORT extern const WindowProperty<bool>* const kCanMaximizeKey;
30 39
(...skipping 29 matching lines...) Expand all
60 // See ui/base/ui_base_types.h for its definition. 69 // See ui/base/ui_base_types.h for its definition.
61 AURA_EXPORT extern const WindowProperty<ui::WindowShowState>* const 70 AURA_EXPORT extern const WindowProperty<ui::WindowShowState>* const
62 kShowStateKey; 71 kShowStateKey;
63 72
64 // Alphabetical sort. 73 // Alphabetical sort.
65 74
66 } // namespace client 75 } // namespace client
67 } // namespace aura 76 } // namespace aura
68 77
69 #endif // UI_AURA_CLIENT_AURA_CONSTANTS_H_ 78 #endif // UI_AURA_CLIENT_AURA_CONSTANTS_H_
OLDNEW
« no previous file with comments | « no previous file | ui/aura/client/aura_constants.cc » ('j') | ui/aura/window_tree_host_platform.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698