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

Unified Diff: android_webview/browser/aw_content_browser_client.cc

Issue 1155713005: Use a resource throttle to implement shouldOverrideUrlLoading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix trybot failure (use static inner class in instrumentation test) Created 5 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
Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 1c4d632809046c9076e1376f1f5da88316c23bb1..134f66e53fa0211f5eaab4fec6783cbbfc081d51 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -57,9 +57,6 @@ public:
BrowserThread::ID* thread) override;
bool OnMessageReceived(const IPC::Message& message) override;
- void OnShouldOverrideUrlLoading(int routing_id,
- const base::string16& url,
- bool* ignore_navigation);
void OnSubFrameCreated(int parent_render_frame_id, int child_render_frame_id);
private:
@@ -80,38 +77,17 @@ AwContentsMessageFilter::~AwContentsMessageFilter() {
void AwContentsMessageFilter::OverrideThreadForMessage(
sgurun-gerrit only 2015/07/08 01:08:54 nit:remove empty method.
gsennton 2015/07/08 11:12:55 Done.
const IPC::Message& message, BrowserThread::ID* thread) {
- if (message.type() == AwViewHostMsg_ShouldOverrideUrlLoading::ID) {
- *thread = BrowserThread::UI;
- }
}
bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(AwContentsMessageFilter, message)
- IPC_MESSAGE_HANDLER(AwViewHostMsg_ShouldOverrideUrlLoading,
- OnShouldOverrideUrlLoading)
IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
}
-void AwContentsMessageFilter::OnShouldOverrideUrlLoading(
- int render_frame_id,
- const base::string16& url,
- bool* ignore_navigation) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- *ignore_navigation = false;
- AwContentsClientBridgeBase* client =
- AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
- if (client) {
- *ignore_navigation = client->ShouldOverrideUrlLoading(url);
- } else {
- LOG(WARNING) << "Failed to find the associated render view host for url: "
- << url;
- }
-}
-
void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id,
int child_render_frame_id) {
AwContentsIoThreadClient::SubFrameCreated(

Powered by Google App Engine
This is Rietveld 408576698