Revert "Load web contents after tab is created."
This reverts commit 4c55f398de
.
BUG=432562
TBR=tedchoc@chromium.org,jbudorick@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/894003005
Cr-Commit-Position: refs/heads/master@{#314469}
This commit is contained in:

committed by
Commit bot

parent
7f6a0230ed
commit
6b96dd532a
build/android/findbugs_filter
chrome
content
browser
web_contents
public
android
java
src
org
chromium
@ -5,4 +5,3 @@ M D UrF: Unread public/protected field: org.chromium.chrome.browser.document.Pen
|
|||||||
M D UuF: Unused public or protected field: org.chromium.chrome.browser.document.PendingDocumentData.webContents In PendingDocumentData.java
|
M D UuF: Unused public or protected field: org.chromium.chrome.browser.document.PendingDocumentData.webContents In PendingDocumentData.java
|
||||||
M D UuF: Unused public or protected field: org.chromium.chrome.browser.document.PendingDocumentData.originalIntent In PendingDocumentData.java
|
M D UuF: Unused public or protected field: org.chromium.chrome.browser.document.PendingDocumentData.originalIntent In PendingDocumentData.java
|
||||||
M D UuF: Unused public or protected field: org.chromium.chrome.browser.document.PendingDocumentData.url In PendingDocumentData.java
|
M D UuF: Unused public or protected field: org.chromium.chrome.browser.document.PendingDocumentData.url In PendingDocumentData.java
|
||||||
M D UuF: Unused public or protected field: org.chromium.chrome.browser.document.PendingDocumentData.userGesture In PendingDocumentData.java
|
|
||||||
|
@ -114,7 +114,6 @@ android_library("chrome_java") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
|
# GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
|
||||||
# GYP: //chrome/chrome_browser.gypi:add_web_contents_result_java
|
|
||||||
# GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
|
# GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
|
||||||
# GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_java
|
# GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_java
|
||||||
# GYP: //chrome/chrome_browser.gypi:tab_load_status_java
|
# GYP: //chrome/chrome_browser.gypi:tab_load_status_java
|
||||||
@ -122,7 +121,6 @@ android_library("chrome_java") {
|
|||||||
java_cpp_enum("chrome_android_java_enums_srcjar") {
|
java_cpp_enum("chrome_android_java_enums_srcjar") {
|
||||||
sources = [
|
sources = [
|
||||||
"//chrome/browser/android/activity_type_ids.h",
|
"//chrome/browser/android/activity_type_ids.h",
|
||||||
"//chrome/browser/android/chrome_web_contents_delegate_android.h",
|
|
||||||
"//chrome/browser/android/tab_android.h",
|
"//chrome/browser/android/tab_android.h",
|
||||||
"//chrome/browser/profiles/profile_metrics.h",
|
"//chrome/browser/profiles/profile_metrics.h",
|
||||||
"//chrome/browser/sync/profile_sync_service_android.cc",
|
"//chrome/browser/sync/profile_sync_service_android.cc",
|
||||||
@ -130,7 +128,6 @@ java_cpp_enum("chrome_android_java_enums_srcjar") {
|
|||||||
]
|
]
|
||||||
outputs = [
|
outputs = [
|
||||||
"org/chromium/chrome/browser/ActivityTypeIds.java",
|
"org/chromium/chrome/browser/ActivityTypeIds.java",
|
||||||
"org/chromium/chrome/browser/AddWebContentsResult.java",
|
|
||||||
"org/chromium/chrome/browser/TabLoadStatus.java",
|
"org/chromium/chrome/browser/TabLoadStatus.java",
|
||||||
"org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java",
|
"org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java",
|
||||||
"org/chromium/chrome/browser/sync/ModelTypeSelection.java",
|
"org/chromium/chrome/browser/sync/ModelTypeSelection.java",
|
||||||
|
@ -28,9 +28,9 @@ public class ChromeWebContentsDelegateAndroid extends WebContentsDelegateAndroid
|
|||||||
}
|
}
|
||||||
|
|
||||||
@CalledByNative
|
@CalledByNative
|
||||||
public int addNewContents(WebContents sourceWebContents, WebContents webContents,
|
public boolean addNewContents(WebContents sourceWebContents, WebContents webContents,
|
||||||
int disposition, Rect initialPosition, boolean userGesture) {
|
int disposition, Rect initialPosition, boolean userGesture) {
|
||||||
return AddWebContentsResult.STOP_LOAD_AND_DELETE;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -29,9 +29,6 @@ public class PendingDocumentData {
|
|||||||
/** HTTP "referer". */
|
/** HTTP "referer". */
|
||||||
public Referrer referrer;
|
public Referrer referrer;
|
||||||
|
|
||||||
/** The original intent. */
|
/** The original intent */
|
||||||
public Intent originalIntent;
|
public Intent originalIntent;
|
||||||
|
|
||||||
/** Whether there was a user gesture during the navigation. */
|
|
||||||
public boolean userGesture;
|
|
||||||
}
|
}
|
@ -320,8 +320,7 @@ void ChromeWebContentsDelegateAndroid::AddNewContents(
|
|||||||
|
|
||||||
JNIEnv* env = AttachCurrentThread();
|
JNIEnv* env = AttachCurrentThread();
|
||||||
ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
|
ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
|
||||||
AddWebContentsResult add_result =
|
bool handled = false;
|
||||||
ADD_WEB_CONTENTS_RESULT_STOP_LOAD_AND_DELETE;
|
|
||||||
if (!obj.is_null()) {
|
if (!obj.is_null()) {
|
||||||
ScopedJavaLocalRef<jobject> jsource;
|
ScopedJavaLocalRef<jobject> jsource;
|
||||||
if (source)
|
if (source)
|
||||||
@ -330,21 +329,19 @@ void ChromeWebContentsDelegateAndroid::AddNewContents(
|
|||||||
if (new_contents)
|
if (new_contents)
|
||||||
jnew_contents = new_contents->GetJavaWebContents();
|
jnew_contents = new_contents->GetJavaWebContents();
|
||||||
|
|
||||||
add_result = static_cast<AddWebContentsResult>(
|
handled = Java_ChromeWebContentsDelegateAndroid_addNewContents(
|
||||||
Java_ChromeWebContentsDelegateAndroid_addNewContents(
|
env,
|
||||||
env,
|
obj.obj(),
|
||||||
obj.obj(),
|
jsource.obj(),
|
||||||
jsource.obj(),
|
jnew_contents.obj(),
|
||||||
jnew_contents.obj(),
|
static_cast<jint>(disposition),
|
||||||
static_cast<jint>(disposition),
|
NULL,
|
||||||
NULL,
|
user_gesture);
|
||||||
user_gesture));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (was_blocked)
|
if (was_blocked)
|
||||||
*was_blocked = !(add_result == ADD_WEB_CONTENTS_RESULT_PROCEED);
|
*was_blocked = !handled;
|
||||||
|
if (!handled)
|
||||||
if (add_result == ADD_WEB_CONTENTS_RESULT_STOP_LOAD_AND_DELETE)
|
|
||||||
delete new_contents;
|
delete new_contents;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,16 +27,6 @@ class RectF;
|
|||||||
namespace chrome {
|
namespace chrome {
|
||||||
namespace android {
|
namespace android {
|
||||||
|
|
||||||
// An enum with the result of calling AddNewContents() in Java.
|
|
||||||
//
|
|
||||||
// A Java counterpart will be generated for this enum.
|
|
||||||
// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
|
|
||||||
enum AddWebContentsResult {
|
|
||||||
ADD_WEB_CONTENTS_RESULT_PROCEED,
|
|
||||||
ADD_WEB_CONTENTS_RESULT_STOP_LOAD,
|
|
||||||
ADD_WEB_CONTENTS_RESULT_STOP_LOAD_AND_DELETE
|
|
||||||
};
|
|
||||||
|
|
||||||
// Chromium Android specific WebContentsDelegate.
|
// Chromium Android specific WebContentsDelegate.
|
||||||
// Should contain any WebContentsDelegate implementations required by
|
// Should contain any WebContentsDelegate implementations required by
|
||||||
// the Chromium Android port but not to be shared with WebView.
|
// the Chromium Android port but not to be shared with WebView.
|
||||||
|
@ -606,7 +606,6 @@
|
|||||||
'chrome_version_java',
|
'chrome_version_java',
|
||||||
'document_tab_model_info_proto_java',
|
'document_tab_model_info_proto_java',
|
||||||
'profile_account_management_metrics_java',
|
'profile_account_management_metrics_java',
|
||||||
'add_web_contents_result_java',
|
|
||||||
'content_setting_java',
|
'content_setting_java',
|
||||||
'content_settings_type_java',
|
'content_settings_type_java',
|
||||||
'page_info_connection_type_java',
|
'page_info_connection_type_java',
|
||||||
|
@ -3638,15 +3638,6 @@
|
|||||||
},
|
},
|
||||||
'includes': [ '../build/android/java_cpp_enum.gypi' ],
|
'includes': [ '../build/android/java_cpp_enum.gypi' ],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
# GN: //chrome/android:chrome_android_java_enums_srcjar
|
|
||||||
'target_name': 'add_web_contents_result_java',
|
|
||||||
'type': 'none',
|
|
||||||
'variables': {
|
|
||||||
'source_file': 'browser/android/chrome_web_contents_delegate_android.h',
|
|
||||||
},
|
|
||||||
'includes': [ '../build/android/java_cpp_enum.gypi' ],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
# GN: //chrome/android:chrome_android_java_enums_srcjar
|
# GN: //chrome/android:chrome_android_java_enums_srcjar
|
||||||
'target_name': 'profile_sync_service_model_type_selection_java',
|
'target_name': 'profile_sync_service_model_type_selection_java',
|
||||||
|
@ -480,19 +480,4 @@ void WebContentsAndroid::AddMessageToDevToolsConsole(JNIEnv* env,
|
|||||||
ConvertJavaStringToUTF8(env, message)));
|
ConvertJavaStringToUTF8(env, message)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebContentsAndroid::OpenURL(JNIEnv* env,
|
|
||||||
jobject obj,
|
|
||||||
jstring url,
|
|
||||||
jboolean user_gesture,
|
|
||||||
jboolean is_renderer_initiated) {
|
|
||||||
GURL gurl(base::android::ConvertJavaStringToUTF8(env, url));
|
|
||||||
OpenURLParams open_params(gurl,
|
|
||||||
Referrer(),
|
|
||||||
CURRENT_TAB,
|
|
||||||
ui::PAGE_TRANSITION_LINK,
|
|
||||||
is_renderer_initiated);
|
|
||||||
open_params.user_gesture = user_gesture;
|
|
||||||
web_contents_->OpenURL(open_params);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace content
|
} // namespace content
|
||||||
|
@ -109,12 +109,6 @@ class CONTENT_EXPORT WebContentsAndroid
|
|||||||
jint level,
|
jint level,
|
||||||
jstring message);
|
jstring message);
|
||||||
|
|
||||||
void OpenURL(JNIEnv* env,
|
|
||||||
jobject jobj,
|
|
||||||
jstring url,
|
|
||||||
jboolean user_gesture,
|
|
||||||
jboolean is_renderer_initiated);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
|
RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
|
||||||
|
|
||||||
|
@ -296,11 +296,6 @@ import org.chromium.content_public.browser.WebContents;
|
|||||||
nativeAddMessageToDevToolsConsole(mNativeWebContentsAndroid, level, message);
|
nativeAddMessageToDevToolsConsole(mNativeWebContentsAndroid, level, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void openUrl(String url, boolean userGesture, boolean isRendererInitiated) {
|
|
||||||
nativeOpenURL(mNativeWebContentsAndroid, url, userGesture, isRendererInitiated);
|
|
||||||
}
|
|
||||||
|
|
||||||
@CalledByNative
|
@CalledByNative
|
||||||
private static void onEvaluateJavaScriptResult(
|
private static void onEvaluateJavaScriptResult(
|
||||||
String jsonResult, JavaScriptCallback callback) {
|
String jsonResult, JavaScriptCallback callback) {
|
||||||
@ -352,6 +347,4 @@ import org.chromium.content_public.browser.WebContents;
|
|||||||
String script, JavaScriptCallback callback);
|
String script, JavaScriptCallback callback);
|
||||||
private native void nativeAddMessageToDevToolsConsole(
|
private native void nativeAddMessageToDevToolsConsole(
|
||||||
long nativeWebContentsAndroid, int level, String message);
|
long nativeWebContentsAndroid, int level, String message);
|
||||||
private native void nativeOpenURL(long nativeWebContentsAndroid, String url,
|
|
||||||
boolean userGesture, boolean isRendererInitiated);
|
|
||||||
}
|
}
|
||||||
|
@ -213,13 +213,4 @@ public interface WebContents {
|
|||||||
* org.chromium.content_public.common.ConsoleMessageLevel.
|
* org.chromium.content_public.common.ConsoleMessageLevel.
|
||||||
*/
|
*/
|
||||||
public void addMessageToDevToolsConsole(int level, String message);
|
public void addMessageToDevToolsConsole(int level, String message);
|
||||||
|
|
||||||
/**
|
|
||||||
* Opens a URL on web contents.
|
|
||||||
* @param url The URL to open.
|
|
||||||
* @param userGesture Whether navigation is triggered during a user gesture.
|
|
||||||
* @param isRendererInitiated Whether the navigation was started in the renderer (e.g.
|
|
||||||
* clicking on a link).
|
|
||||||
*/
|
|
||||||
public void openUrl(String url, boolean userGesture, boolean isRendererInitiated);
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user