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

Side by Side Diff: android_webview/native/aw_contents_client_bridge.h

Issue 1530183004: Revert 3 CLs for shouldOverrideUrlLoading implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase (simple conflict in AwContentsClientShouldOverrideUrlLoadingTest). Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_
6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" 10 #include "android_webview/browser/aw_contents_client_bridge_base.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 const GURL& origin_url, 47 const GURL& origin_url,
48 const base::string16& message_text, 48 const base::string16& message_text,
49 const base::string16& default_prompt_text, 49 const base::string16& default_prompt_text,
50 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 50 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
51 override; 51 override;
52 void RunBeforeUnloadDialog( 52 void RunBeforeUnloadDialog(
53 const GURL& origin_url, 53 const GURL& origin_url,
54 const base::string16& message_text, 54 const base::string16& message_text,
55 const content::JavaScriptDialogManager::DialogClosedCallback& callback) 55 const content::JavaScriptDialogManager::DialogClosedCallback& callback)
56 override; 56 override;
57 bool ShouldOverrideUrlLoading(const base::string16& url,
58 bool has_user_gesture,
59 bool is_redirect,
60 bool is_main_frame) override;
57 61
58 // Methods called from Java. 62 // Methods called from Java.
59 void ProceedSslError(JNIEnv* env, 63 void ProceedSslError(JNIEnv* env,
60 const base::android::JavaRef<jobject>& obj, 64 const base::android::JavaRef<jobject>& obj,
61 jboolean proceed, 65 jboolean proceed,
62 jint id); 66 jint id);
63 void ProvideClientCertificateResponse( 67 void ProvideClientCertificateResponse(
64 JNIEnv* env, 68 JNIEnv* env,
65 const base::android::JavaRef<jobject>& object, 69 const base::android::JavaRef<jobject>& object,
66 jint request_id, 70 jint request_id,
(...skipping 18 matching lines...) Expand all
85 // doesn't provide Release, so ownership is managed manually. 89 // doesn't provide Release, so ownership is managed manually.
86 IDMap<content::ClientCertificateDelegate> 90 IDMap<content::ClientCertificateDelegate>
87 pending_client_cert_request_delegates_; 91 pending_client_cert_request_delegates_;
88 }; 92 };
89 93
90 bool RegisterAwContentsClientBridge(JNIEnv* env); 94 bool RegisterAwContentsClientBridge(JNIEnv* env);
91 95
92 } // namespace android_webview 96 } // namespace android_webview
93 97
94 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_ 98 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_CLIENT_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698