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

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: Fixed few nits and new line issues. Created 6 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
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 82d79ab8a83c013bb934cf89f4da2c6535d9f1cd..a2652ce39a9c29d2c22a182d9ed9b4c83b49a55f 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -819,8 +819,10 @@ scoped_refptr<cc::Layer> ContentViewCoreImpl::GetLayer() const {
// Methods called from Java via JNI
// ----------------------------------------------------------------------------
-void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env, jobject obj,
- jintArray indices) {
+void ContentViewCoreImpl::SelectPopupMenuItems(
+ JNIEnv* env,
+ jobject obj,
+ jintArray indices) {
RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
web_contents_->GetRenderViewHost());
DCHECK(rvhi);
@@ -895,15 +897,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_;
}
@@ -1499,28 +1492,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());
« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | content/browser/web_contents/web_contents_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698