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

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: Created 4 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 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 bool is_redirect, 122 bool is_redirect,
123 bool is_main_frame, 123 bool is_main_frame,
124 bool* ignore_navigation) { 124 bool* ignore_navigation) {
125 DCHECK_CURRENTLY_ON(BrowserThread::UI); 125 DCHECK_CURRENTLY_ON(BrowserThread::UI);
126 *ignore_navigation = false; 126 *ignore_navigation = false;
127 AwContentsClientBridgeBase* client = 127 AwContentsClientBridgeBase* client =
128 AwContentsClientBridgeBase::FromID(process_id_, render_frame_id); 128 AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
129 if (client) { 129 if (client) {
130 *ignore_navigation = client->ShouldOverrideUrlLoading( 130 *ignore_navigation = client->ShouldOverrideUrlLoading(
131 url, has_user_gesture, is_redirect, is_main_frame); 131 url, has_user_gesture, is_redirect, is_main_frame);
132 // If the shouldOverrideUrlLoading call caused a java exception we should
133 // always return immediately here!
132 } else { 134 } else {
133 LOG(WARNING) << "Failed to find the associated render view host for url: " 135 LOG(WARNING) << "Failed to find the associated render view host for url: "
134 << url; 136 << url;
135 } 137 }
136 } 138 }
137 139
138 void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id, 140 void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id,
139 int child_render_frame_id) { 141 int child_render_frame_id) {
140 AwContentsIoThreadClient::SubFrameCreated( 142 AwContentsIoThreadClient::SubFrameCreated(
141 process_id_, parent_render_frame_id, child_render_frame_id); 143 process_id_, parent_render_frame_id, child_render_frame_id);
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 554
553 #if defined(VIDEO_HOLE) 555 #if defined(VIDEO_HOLE)
554 content::ExternalVideoSurfaceContainer* 556 content::ExternalVideoSurfaceContainer*
555 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 557 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
556 content::WebContents* web_contents) { 558 content::WebContents* web_contents) {
557 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 559 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
558 } 560 }
559 #endif 561 #endif
560 562
561 } // namespace android_webview 563 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698