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

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

Unified Diff: ui/aura/window_tree_host_platform.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: Addressing feedback 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 | « ui/aura/client/aura_constants.cc ('k') | ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java » ('j') | ui/platform_window/android/platform_window_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/aura/window_tree_host_platform.cc

diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc

index 10c50132dadf2e9a3013e0b29da5dfae52d2eea8..0f834ebfa276992c0d6ba41209cfb84261755f09 100644

--- a/ui/aura/window_tree_host_platform.cc

+++ b/ui/aura/window_tree_host_platform.cc

@@ -11,6 +11,7 @@

#include "ui/gfx/screen.h"

#if defined(OS_ANDROID)

+#include "ui/aura/client/aura_constants.h"

#include "ui/platform_window/android/platform_window_android.h"

#endif

@@ -71,6 +72,15 @@ gfx::AcceleratedWidget WindowTreeHostPlatform::GetAcceleratedWidget() {

}

void WindowTreeHostPlatform::ShowImpl() {

+#if defined(OS_ANDROID)

+ ui::PlatformWindowAndroid* pwa =

+ ui::PlatformWindowAndroid::From(window_.get());

+ if (!pwa->IsAttachedToActivity()) {

+ jobject activity = window()->GetProperty(

+ aura::client::kActivityForRootWindow);

+ pwa->AttachToActivity(activity);

+ }

+#endif

window_->Show();

}