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

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

Issue 16907002: Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | Annotate | Revision Log
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_contents_client_bridge_base.h" 9 #include "android_webview/browser/aw_contents_client_bridge_base.h"
10 #include "android_webview/browser/aw_cookie_access_policy.h" 10 #include "android_webview/browser/aw_cookie_access_policy.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 ResourceType::Type resource_type, 250 ResourceType::Type resource_type,
251 bool overridable, 251 bool overridable,
252 bool strict_enforcement, 252 bool strict_enforcement,
253 const base::Callback<void(bool)>& callback, 253 const base::Callback<void(bool)>& callback,
254 content::CertificateRequestResultType* result) { 254 content::CertificateRequestResultType* result) {
255 255
256 AwContentsClientBridgeBase* client = 256 AwContentsClientBridgeBase* client =
257 AwContentsClientBridgeBase::FromID(render_process_id, render_view_id); 257 AwContentsClientBridgeBase::FromID(render_process_id, render_view_id);
258 bool cancel_request = true; 258 bool cancel_request = true;
259 if (client) 259 if (client)
260 client->AllowCertificateError(cert_error, ssl_info.cert, request_url, 260 client->AllowCertificateError(cert_error,
261 callback, &cancel_request); 261 ssl_info.cert.get(),
262 request_url,
263 callback,
264 &cancel_request);
262 if (cancel_request) 265 if (cancel_request)
263 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; 266 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
264 } 267 }
265 268
266 WebKit::WebNotificationPresenter::Permission 269 WebKit::WebNotificationPresenter::Permission
267 AwContentBrowserClient::CheckDesktopNotificationPermission( 270 AwContentBrowserClient::CheckDesktopNotificationPermission(
268 const GURL& source_url, 271 const GURL& source_url,
269 content::ResourceContext* context, 272 content::ResourceContext* context,
270 int render_process_id) { 273 int render_process_id) {
271 // Android WebView does not support notifications, so return Denied here. 274 // Android WebView does not support notifications, so return Denied here.
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 375
373 bool AwContentBrowserClient::AllowPepperSocketAPI( 376 bool AwContentBrowserClient::AllowPepperSocketAPI(
374 content::BrowserContext* browser_context, 377 content::BrowserContext* browser_context,
375 const GURL& url, 378 const GURL& url,
376 const content::SocketPermissionRequest& params) { 379 const content::SocketPermissionRequest& params) {
377 NOTREACHED() << "Android WebView does not support plugins"; 380 NOTREACHED() << "Android WebView does not support plugins";
378 return false; 381 return false;
379 } 382 }
380 383
381 } // namespace android_webview 384 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_browser_context.cc ('k') | android_webview/browser/aw_form_database_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698