| 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 <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 bool* no_javascript_access) override; | 138 bool* no_javascript_access) override; |
| 139 void RegisterInProcessMojoApplications( | 139 void RegisterInProcessMojoApplications( |
| 140 StaticMojoApplicationMap* apps) override; | 140 StaticMojoApplicationMap* apps) override; |
| 141 #if defined(OS_ANDROID) | 141 #if defined(OS_ANDROID) |
| 142 void GetAdditionalMappedFilesForChildProcess( | 142 void GetAdditionalMappedFilesForChildProcess( |
| 143 const base::CommandLine& command_line, | 143 const base::CommandLine& command_line, |
| 144 int child_process_id, | 144 int child_process_id, |
| 145 content::FileDescriptorInfo* mappings, | 145 content::FileDescriptorInfo* mappings, |
| 146 std::map<int, base::MemoryMappedFile::Region>* regions) override; | 146 std::map<int, base::MemoryMappedFile::Region>* regions) override; |
| 147 #else | 147 #else |
| 148 ::media::AudioManager* CreateAudioManager( |
| 149 ::media::AudioLogFactory* audio_log_factory) override; |
| 148 std::unique_ptr<::media::CdmFactory> CreateCdmFactory() override; | 150 std::unique_ptr<::media::CdmFactory> CreateCdmFactory() override; |
| 149 void GetAdditionalMappedFilesForChildProcess( | 151 void GetAdditionalMappedFilesForChildProcess( |
| 150 const base::CommandLine& command_line, | 152 const base::CommandLine& command_line, |
| 151 int child_process_id, | 153 int child_process_id, |
| 152 content::FileDescriptorInfo* mappings) override; | 154 content::FileDescriptorInfo* mappings) override; |
| 153 #endif // defined(OS_ANDROID) | 155 #endif // defined(OS_ANDROID) |
| 154 void GetAdditionalWebUISchemes( | 156 void GetAdditionalWebUISchemes( |
| 155 std::vector<std::string>* additional_schemes) override; | 157 std::vector<std::string>* additional_schemes) override; |
| 156 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) | 158 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 157 content::ExternalVideoSurfaceContainer* | 159 content::ExternalVideoSurfaceContainer* |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 CastBrowserMainParts* cast_browser_main_parts_; | 192 CastBrowserMainParts* cast_browser_main_parts_; |
| 191 std::unique_ptr<URLRequestContextFactory> url_request_context_factory_; | 193 std::unique_ptr<URLRequestContextFactory> url_request_context_factory_; |
| 192 | 194 |
| 193 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); | 195 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); |
| 194 }; | 196 }; |
| 195 | 197 |
| 196 } // namespace shell | 198 } // namespace shell |
| 197 } // namespace chromecast | 199 } // namespace chromecast |
| 198 | 200 |
| 199 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 201 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |