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

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

Issue 1013843002: favor DCHECK_CURRENTLY_ON for better logs in android_webview/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change a few more Created 5 years, 9 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
« no previous file with comments | « no previous file | android_webview/browser/aw_contents_client_bridge_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_browser_main_parts.h" 8 #include "android_webview/browser/aw_browser_main_parts.h"
9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" 10 #include "android_webview/browser/aw_contents_client_bridge_base.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated) 95 IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated)
96 IPC_MESSAGE_UNHANDLED(handled = false) 96 IPC_MESSAGE_UNHANDLED(handled = false)
97 IPC_END_MESSAGE_MAP() 97 IPC_END_MESSAGE_MAP()
98 return handled; 98 return handled;
99 } 99 }
100 100
101 void AwContentsMessageFilter::OnShouldOverrideUrlLoading( 101 void AwContentsMessageFilter::OnShouldOverrideUrlLoading(
102 int render_frame_id, 102 int render_frame_id,
103 const base::string16& url, 103 const base::string16& url,
104 bool* ignore_navigation) { 104 bool* ignore_navigation) {
105 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 105 DCHECK_CURRENTLY_ON(BrowserThread::UI);
106 *ignore_navigation = false; 106 *ignore_navigation = false;
107 AwContentsClientBridgeBase* client = 107 AwContentsClientBridgeBase* client =
108 AwContentsClientBridgeBase::FromID(process_id_, render_frame_id); 108 AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
109 if (client) { 109 if (client) {
110 *ignore_navigation = client->ShouldOverrideUrlLoading(url); 110 *ignore_navigation = client->ShouldOverrideUrlLoading(url);
111 } else { 111 } else {
112 LOG(WARNING) << "Failed to find the associated render view host for url: " 112 LOG(WARNING) << "Failed to find the associated render view host for url: "
113 << url; 113 << url;
114 } 114 }
115 } 115 }
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); 554 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
555 } 555 }
556 #endif 556 #endif
557 557
558 content::DevToolsManagerDelegate* 558 content::DevToolsManagerDelegate*
559 AwContentBrowserClient::GetDevToolsManagerDelegate() { 559 AwContentBrowserClient::GetDevToolsManagerDelegate() {
560 return new AwDevToolsManagerDelegate(); 560 return new AwDevToolsManagerDelegate();
561 } 561 }
562 562
563 } // namespace android_webview 563 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/aw_contents_client_bridge_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698