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

Unified 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 side-by-side diff with in-line comments
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')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/client/aura_constants.h
diff --git a/ui/aura/client/aura_constants.h b/ui/aura/client/aura_constants.h
index 5999b850978c4f64c533ad574982aedddf71d6de..0cec1bcdf0fe79f76abe386e93cabbd84784c0eb 100644
--- a/ui/aura/client/aura_constants.h
+++ b/ui/aura/client/aura_constants.h
@@ -9,6 +9,10 @@
#include "ui/aura/window.h"
#include "ui/base/ui_base_types.h"
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#endif
+
namespace ui {
class InputMethod;
}
@@ -18,6 +22,11 @@ namespace client {
// Alphabetical sort.
+#if defined(OS_ANDROID)
+// A property key to store Android Activity associated with the root window.
+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
+#endif
+
// A property key to store always-on-top flag.
AURA_EXPORT extern const WindowProperty<bool>* const kAlwaysOnTopKey;
« 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