content/browser/android/content_view_core_impl.cc - Issue 10963041: Revert "Revert 158067 - Remove native side of content_view_client"

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 10963041: Revert "Revert 158067 - Remove native side of content_view_client" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add additional_input_paths as a variable and input to java.gypi Created 8 years, 3 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 b593c197badd066b5e802770a0efd38b24826645..6fb4b42cb30b8c2de89f230c9ddf4c5522b73287 100644

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

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

@@ -9,7 +9,6 @@

#include "base/android/jni_string.h"

#include "base/android/scoped_java_ref.h"

#include "base/json/json_writer.h"

-#include "content/browser/android/content_view_client.h"

#include "content/browser/android/load_url_params.h"

#include "content/browser/android/touch_point.h"

#include "content/browser/renderer_host/java/java_bound_object.h"

@@ -464,13 +463,6 @@ jboolean ContentViewCoreImpl::NeedsReload(JNIEnv* env, jobject obj) {

return web_contents_->GetController().NeedsReload();

}

-void ContentViewCoreImpl::SetClient(JNIEnv* env, jobject obj, jobject jclient) {

- scoped_ptr<ContentViewClient> client(

- ContentViewClient::CreateNativeContentViewClient(env, jclient));

- content_view_client_.swap(client);

void ContentViewCoreImpl::AddJavascriptInterface(

JNIEnv* env,

jobject /* obj */,