content/content_jni.gypi - Issue 10696173: Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

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/content_jni.gypi

Issue 10696173: Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase number deux Created 8 years, 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/content_browser.gypi ('k') | content/public/android/java/src/org/chromium/content/browser/ContentSettings.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_jni.gypi

diff --git a/content/content_jni.gypi b/content/content_jni.gypi

index 31acf334920e2ad6219fdaed48cad8ab42474a5b..e85a7c0cc13d5a8ed810e9dbea9986b57b84787a 100644

--- a/content/content_jni.gypi

+++ b/content/content_jni.gypi

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

'public/android/java/src/org/chromium/content/app/UserAgent.java',

'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java',

'public/android/java/src/org/chromium/content/browser/ContentSettings.java',

- 'public/android/java/src/org/chromium/content/browser/ContentView.java',

'public/android/java/src/org/chromium/content/browser/ContentViewClient.java',

+ 'public/android/java/src/org/chromium/content/browser/ContentViewCore.java',

'public/android/java/src/org/chromium/content/browser/DeviceOrientation.java',

'public/android/java/src/org/chromium/content/browser/DownloadController.java',

'public/android/java/src/org/chromium/content/browser/LocationProvider.java',

@@ -35,8 +35,8 @@

'<(SHARED_INTERMEDIATE_DIR)/content/jni/user_agent_jni.h',

'<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h',

'<(SHARED_INTERMEDIATE_DIR)/content/jni/content_settings_jni.h',

- '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_jni.h',

'<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_client_jni.h',

+ '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_core_jni.h',

'<(SHARED_INTERMEDIATE_DIR)/content/jni/device_orientation_jni.h',

'<(SHARED_INTERMEDIATE_DIR)/content/jni/download_controller_jni.h',

'<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h',

« no previous file with comments | « content/content_browser.gypi ('k') | content/public/android/java/src/org/chromium/content/browser/ContentSettings.java » ('j') | no next file with comments »