chrome/browser/android/tab_android.cc - Issue 406023002: Restructuring NavigationController functionalities from ContentViewCore to NavigationController

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: chrome/browser/android/tab_android.cc

Issue 406023002: Restructuring NavigationController functionalities from ContentViewCore to NavigationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed the unit test build break 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

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java ('k') | content/browser/android/content_view_core_impl.h » ('j') | content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/tab_android.cc

diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc

index f175c0f92587ebb466db9a01ec39c4323ecce6c8..715152e957d1b00f430bb09afeda057ccc829db1 100644

--- a/chrome/browser/android/tab_android.cc

+++ b/chrome/browser/android/tab_android.cc

@@ -434,8 +434,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,

jstring j_referrer_url,

jint referrer_policy,

jboolean is_renderer_initiated) {

- content::ContentViewCore* content_view = GetContentViewCore();

- if (!content_view)

+ if (!web_contents())

return PAGE_LOAD_FAILED;

GURL gurl(base::android::ConvertJavaStringToUTF8(env, url));

@@ -528,7 +527,7 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,

return DEFAULT_PAGE_LOAD;

}

load_params.is_renderer_initiated = is_renderer_initiated;

- content_view->LoadUrl(load_params);

+ web_contents()->GetController().LoadURLWithParams(load_params);

}

return DEFAULT_PAGE_LOAD;

}