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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 2169553002: Properly throw java exceptions from shouldOverrideUrlLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused includes in test_support_android.cc. Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "android_webview/browser/aw_content_browser_client.h" 5 #include "android_webview/browser/aw_content_browser_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_browser_main_parts.h" 10 #include "android_webview/browser/aw_browser_main_parts.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 bool is_redirect, 123 bool is_redirect,
124 bool is_main_frame, 124 bool is_main_frame,
125 bool* ignore_navigation) { 125 bool* ignore_navigation) {
126 DCHECK_CURRENTLY_ON(BrowserThread::UI); 126 DCHECK_CURRENTLY_ON(BrowserThread::UI);
127 *ignore_navigation = false; 127 *ignore_navigation = false;
128 AwContentsClientBridgeBase* client = 128 AwContentsClientBridgeBase* client =
129 AwContentsClientBridgeBase::FromID(process_id_, render_frame_id); 129 AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
130 if (client) { 130 if (client) {
131 *ignore_navigation = client->ShouldOverrideUrlLoading( 131 *ignore_navigation = client->ShouldOverrideUrlLoading(
132 url, has_user_gesture, is_redirect, is_main_frame); 132 url, has_user_gesture, is_redirect, is_main_frame);
133 // If the shouldOverrideUrlLoading call caused a java exception we should
134 // always return immediately here!
133 } else { 135 } else {
134 LOG(WARNING) << "Failed to find the associated render view host for url: " 136 LOG(WARNING) << "Failed to find the associated render view host for url: "
135 << url; 137 << url;
136 } 138 }
137 } 139 }
138 140
139 void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id, 141 void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id,
140 int child_render_frame_id) { 142 int child_render_frame_id) {
141 AwContentsIoThreadClient::SubFrameCreated( 143 AwContentsIoThreadClient::SubFrameCreated(
142 process_id_, parent_render_frame_id, child_render_frame_id); 144 process_id_, parent_render_frame_id, child_render_frame_id);
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 514
513 #if defined(VIDEO_HOLE) 515 #if defined(VIDEO_HOLE)
514 content::ExternalVideoSurfaceContainer* 516 content::ExternalVideoSurfaceContainer*
515 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 517 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
516 content::WebContents* web_contents) { 518 content::WebContents* web_contents) {
517 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 519 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
518 } 520 }
519 #endif 521 #endif
520 522
521 } // namespace android_webview 523 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698