| 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 net::android::StoreCertificate(cert_type, cert_data, cert_size); | 201 net::android::StoreCertificate(cert_type, cert_data, cert_size); |
| 202 } | 202 } |
| 203 | 203 |
| 204 content::BrowserMainParts* AwContentBrowserClient::CreateBrowserMainParts( | 204 content::BrowserMainParts* AwContentBrowserClient::CreateBrowserMainParts( |
| 205 const content::MainFunctionParams& parameters) { | 205 const content::MainFunctionParams& parameters) { |
| 206 return new AwBrowserMainParts(browser_context_.get()); | 206 return new AwBrowserMainParts(browser_context_.get()); |
| 207 } | 207 } |
| 208 | 208 |
| 209 content::WebContentsViewDelegate* | 209 content::WebContentsViewDelegate* |
| 210 AwContentBrowserClient::GetWebContentsViewDelegate( | 210 AwContentBrowserClient::GetWebContentsViewDelegate( |
| 211 content::WebContents* web_contents) { | 211 content::WebContents* web_contents, |
| 212 gfx::NativeView context) { |
| 212 return native_factory_->CreateViewDelegate(web_contents); | 213 return native_factory_->CreateViewDelegate(web_contents); |
| 213 } | 214 } |
| 214 | 215 |
| 215 void AwContentBrowserClient::RenderProcessWillLaunch( | 216 void AwContentBrowserClient::RenderProcessWillLaunch( |
| 216 content::RenderProcessHost* host) { | 217 content::RenderProcessHost* host) { |
| 217 // If WebView becomes multi-process capable, this may be insecure. | 218 // If WebView becomes multi-process capable, this may be insecure. |
| 218 // More benefit can be derived from the ChildProcessSecurotyPolicy by | 219 // More benefit can be derived from the ChildProcessSecurotyPolicy by |
| 219 // deferring the GrantScheme calls until we know that a given child process | 220 // deferring the GrantScheme calls until we know that a given child process |
| 220 // really does need that priviledge. Check here to ensure we rethink this | 221 // really does need that priviledge. Check here to ensure we rethink this |
| 221 // when the time comes. See crbug.com/156062. | 222 // when the time comes. See crbug.com/156062. |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 | 575 |
| 575 #if defined(VIDEO_HOLE) | 576 #if defined(VIDEO_HOLE) |
| 576 content::ExternalVideoSurfaceContainer* | 577 content::ExternalVideoSurfaceContainer* |
| 577 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 578 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
| 578 content::WebContents* web_contents) { | 579 content::WebContents* web_contents) { |
| 579 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 580 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
| 580 } | 581 } |
| 581 #endif | 582 #endif |
| 582 | 583 |
| 583 } // namespace android_webview | 584 } // namespace android_webview |
| OLD | NEW |