OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "content/public/browser/content_browser_client.h" | 10 #include "content/public/browser/content_browser_client.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 int child_process_id, | 77 int child_process_id, |
78 content::FileDescriptorInfo* mappings) override; | 78 content::FileDescriptorInfo* mappings) override; |
79 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) | 79 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) |
80 virtual content::ExternalVideoSurfaceContainer* | 80 virtual content::ExternalVideoSurfaceContainer* |
81 OverrideCreateExternalVideoSurfaceContainer( | 81 OverrideCreateExternalVideoSurfaceContainer( |
82 content::WebContents* web_contents) override; | 82 content::WebContents* web_contents) override; |
83 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) | 83 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) |
84 | 84 |
85 private: | 85 private: |
86 net::X509Certificate* SelectClientCertificateOnIOThread( | 86 net::X509Certificate* SelectClientCertificateOnIOThread( |
87 GURL requesting_url); | 87 GURL requesting_url, |
| 88 int render_process_id); |
88 | 89 |
89 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; | 90 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; |
90 | 91 |
91 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); | 92 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); |
92 }; | 93 }; |
93 | 94 |
94 } // namespace shell | 95 } // namespace shell |
95 } // namespace chromecast | 96 } // namespace chromecast |
96 | 97 |
97 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 98 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |