content/browser/android/content_view_core_impl.cc - Issue 1560553002: Framelet Prototype 2016

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/browser/android/content_view_core_impl.cc

Issue 1560553002: Framelet Prototype 2016 Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased + Applied Brett's Windows + Fixed security issue Created 4 years, 11 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:

Index: content/browser/android/content_view_core_impl.cc

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc

index 965c21e95f0d959e9a013e6e76af0638e981d4d0..f3ebb441b1ee3f2f53231031ac5bccf6e86e445c 100644

--- a/content/browser/android/content_view_core_impl.cc

+++ b/content/browser/android/content_view_core_impl.cc

@@ -35,7 +35,6 @@

#include "content/browser/renderer_host/render_widget_host_view_android.h"

#include "content/browser/web_contents/web_contents_view_android.h"

#include "content/common/frame_messages.h"

-#include "content/common/input/web_input_event_traits.h"

#include "content/common/input_messages.h"

#include "content/common/view_messages.h"

#include "content/public/browser/android/compositor.h"

@@ -48,6 +47,7 @@

#include "content/public/browser/web_contents.h"

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

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

+#include "content/public/common/input/web_input_event_traits.h"

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

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

#include "jni/ContentViewCore_jni.h"