content/shell/browser/shell_android.cc - Issue 2416403002: Reland of Android: support multiple displays on C++ side

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: content/shell/browser/shell_android.cc

Issue 2416403002: Reland of Android: support multiple displays on C++ side (Closed)

Patch Set: Restore GetDisplayNearestWindow(0) functionality to return primary display. Created 4 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:

Index: content/shell/browser/shell_android.cc

diff --git a/content/shell/browser/shell_android.cc b/content/shell/browser/shell_android.cc

index c38e902a4b020640384156032ca9c60c93da25a0..9b760375f16fb3386a3984894be8448e4ac2a9f4 100644

--- a/content/shell/browser/shell_android.cc

+++ b/content/shell/browser/shell_android.cc

@@ -15,6 +15,8 @@

#include "content/public/common/content_switches.h"

#include "content/shell/android/shell_manager.h"

#include "jni/Shell_jni.h"

+#include "ui/android/screen_android.h"

+#include "ui/display/screen.h"

using base::android::AttachCurrentThread;

using base::android::ConvertUTF8ToJavaString;

@@ -24,6 +26,7 @@ using base::android::ScopedJavaLocalRef;

namespace content {

void Shell::PlatformInitialize(const gfx::Size& default_window_size) {

+ display::Screen::SetScreenInstance(ui::CreateScreenAndroid());

}

void Shell::PlatformExit() {