Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1410)

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 414423002: Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted native file changes to correct inclusion order. Created 6 years, 4 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
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 2ce8774f4bba13c89f37bd5f2c90b9df40eb71c6..5984ebff686b21f08eb7b6355ce1d168bea9dfe0 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -825,7 +825,8 @@ scoped_refptr<cc::Layer> ContentViewCoreImpl::GetLayer() const {
// Methods called from Java via JNI
// ----------------------------------------------------------------------------
-void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env, jobject obj,
+void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env,
+ jobject obj,
jintArray indices) {
RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
web_contents_->GetRenderViewHost());
@@ -901,15 +902,6 @@ void ContentViewCoreImpl::LoadUrl(
LoadUrl(params);
}
-ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
- JNIEnv* env, jobject) const {
- return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec());
-}
-
-jboolean ContentViewCoreImpl::IsIncognito(JNIEnv* env, jobject obj) {
- return GetWebContents()->GetBrowserContext()->IsOffTheRecord();
-}
-
WebContents* ContentViewCoreImpl::GetWebContents() const {
return web_contents_;
}
@@ -1505,28 +1497,6 @@ void ContentViewCoreImpl::ExtractSmartClipData(JNIEnv* env,
GetWebContents()->GetRoutingID(), rect));
}
-void ContentViewCoreImpl::ResumeResponseDeferredAtStart(JNIEnv* env,
- jobject obj) {
- static_cast<WebContentsImpl*>(GetWebContents())->
- ResumeResponseDeferredAtStart();
-}
-
-void ContentViewCoreImpl::SetHasPendingNavigationTransitionForTesting(
- JNIEnv* env,
- jobject obj) {
- RenderFrameHost* frame = static_cast<WebContentsImpl*>(GetWebContents())->
- GetMainFrame();
- BrowserThread::PostTask(
- BrowserThread::IO,
- FROM_HERE,
- base::Bind(
- &TransitionRequestManager::SetHasPendingTransitionRequest,
- base::Unretained(TransitionRequestManager::GetInstance()),
- frame->GetProcess()->GetID(),
- frame->GetRoutingID(),
- true));
-}
-
jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) {
return GetRenderProcessIdFromRenderViewHost(
web_contents_->GetRenderViewHost());
@@ -1555,58 +1525,6 @@ void ContentViewCoreImpl::RequestTextSurroundingSelection(
}
}
-void ContentViewCoreImpl::DidDeferAfterResponseStarted(
- const scoped_refptr<net::HttpResponseHeaders>& headers,
- const GURL& url) {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
- if (obj.is_null())
- return;
-
- std::vector<GURL> entering_stylesheets;
- std::string transition_color;
- if (headers) {
- TransitionRequestManager::ParseTransitionStylesheetsFromHeaders(
- headers, entering_stylesheets, url);
-
- headers->EnumerateHeader(
- NULL, "X-Transition-Entering-Color", &transition_color);
- }
-
- ScopedJavaLocalRef<jstring> jstring_transition_color(ConvertUTF8ToJavaString(
- env, transition_color));
-
- Java_ContentViewCore_didDeferAfterResponseStarted(
- env, obj.obj(), jstring_transition_color.obj());
-
- std::vector<GURL>::const_iterator iter = entering_stylesheets.begin();
- for (; iter != entering_stylesheets.end(); ++iter) {
- ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
- env, iter->spec()));
- Java_ContentViewCore_addEnteringStylesheetToTransition(
- env, obj.obj(), jstring_url.obj());
- }
-}
-
-bool ContentViewCoreImpl::WillHandleDeferAfterResponseStarted() {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
- if (obj.is_null())
- return false;
-
- return Java_ContentViewCore_willHandleDeferAfterResponseStarted(env,
- obj.obj());
-}
-
-void ContentViewCoreImpl::DidStartNavigationTransitionForFrame(int64 frame_id) {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
- if (obj.is_null())
- return;
- Java_ContentViewCore_didStartNavigationTransitionForFrame(
- env, obj.obj(), frame_id);
-}
-
void ContentViewCoreImpl::OnSmartClipDataExtracted(
const base::string16& text,
const base::string16& html,

Powered by Google App Engine
This is Rietveld 408576698