OLD | NEW |
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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 const base::Callback<void(net::X509Certificate*)>& callback) { | 387 const base::Callback<void(net::X509Certificate*)>& callback) { |
388 AwContentsClientBridgeBase* client = | 388 AwContentsClientBridgeBase* client = |
389 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); | 389 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); |
390 if (client) { | 390 if (client) { |
391 client->SelectClientCertificate(cert_request_info, callback); | 391 client->SelectClientCertificate(cert_request_info, callback); |
392 } else { | 392 } else { |
393 callback.Run(NULL); | 393 callback.Run(NULL); |
394 } | 394 } |
395 } | 395 } |
396 | 396 |
397 blink::WebNotificationPresenter::Permission | 397 content::NotificationPresenterPermission |
398 AwContentBrowserClient::CheckDesktopNotificationPermission( | 398 AwContentBrowserClient::CheckDesktopNotificationPermission( |
399 const GURL& source_url, | 399 const GURL& source_url, |
400 content::ResourceContext* context, | 400 content::ResourceContext* context, |
401 int render_process_id) { | 401 int render_process_id) { |
402 // Android WebView does not support notifications, so return Denied here. | 402 // Android WebView does not support notifications, so return Denied here. |
403 return blink::WebNotificationPresenter::PermissionDenied; | 403 return content::NOTIFICATION_PRESENTER_PERMISSION_DENIED; |
404 } | 404 } |
405 | 405 |
406 void AwContentBrowserClient::ShowDesktopNotification( | 406 void AwContentBrowserClient::ShowDesktopNotification( |
407 const content::ShowDesktopNotificationHostMsgParams& params, | 407 const content::ShowDesktopNotificationHostMsgParams& params, |
408 content::RenderFrameHost* render_frame_host, | 408 content::RenderFrameHost* render_frame_host, |
409 content::DesktopNotificationDelegate* delegate, | 409 content::DesktopNotificationDelegate* delegate, |
410 base::Closure* cancel_callback) { | 410 base::Closure* cancel_callback) { |
411 NOTREACHED() << "Android WebView does not support desktop notifications."; | 411 NOTREACHED() << "Android WebView does not support desktop notifications."; |
412 } | 412 } |
413 | 413 |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 | 588 |
589 #if defined(VIDEO_HOLE) | 589 #if defined(VIDEO_HOLE) |
590 content::ExternalVideoSurfaceContainer* | 590 content::ExternalVideoSurfaceContainer* |
591 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 591 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
592 content::WebContents* web_contents) { | 592 content::WebContents* web_contents) { |
593 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 593 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
594 } | 594 } |
595 #endif | 595 #endif |
596 | 596 |
597 } // namespace android_webview | 597 } // namespace android_webview |
OLD | NEW |