| 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 <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 const content::Referrer& referrer, | 130 const content::Referrer& referrer, |
| 131 WindowOpenDisposition disposition, | 131 WindowOpenDisposition disposition, |
| 132 const blink::WebWindowFeatures& features, | 132 const blink::WebWindowFeatures& features, |
| 133 bool user_gesture, | 133 bool user_gesture, |
| 134 bool opener_suppressed, | 134 bool opener_suppressed, |
| 135 content::ResourceContext* context, | 135 content::ResourceContext* context, |
| 136 int render_process_id, | 136 int render_process_id, |
| 137 int opener_render_view_id, | 137 int opener_render_view_id, |
| 138 int opener_render_frame_id, | 138 int opener_render_frame_id, |
| 139 bool* no_javascript_access) override; | 139 bool* no_javascript_access) override; |
| 140 void RegisterUnsandboxedOutOfProcessMojoApplications( | 140 void RegisterInProcessMojoApplications( |
| 141 std::map<GURL, base::string16>* apps) override; | 141 StaticMojoApplicationMap* apps) override; |
| 142 #if defined(OS_ANDROID) | 142 #if defined(OS_ANDROID) |
| 143 void GetAdditionalMappedFilesForChildProcess( | 143 void GetAdditionalMappedFilesForChildProcess( |
| 144 const base::CommandLine& command_line, | 144 const base::CommandLine& command_line, |
| 145 int child_process_id, | 145 int child_process_id, |
| 146 content::FileDescriptorInfo* mappings, | 146 content::FileDescriptorInfo* mappings, |
| 147 std::map<int, base::MemoryMappedFile::Region>* regions) override; | 147 std::map<int, base::MemoryMappedFile::Region>* regions) override; |
| 148 #else | 148 #else |
| 149 scoped_ptr<::media::CdmFactory> CreateCdmFactory() override; | 149 scoped_ptr<::media::CdmFactory> CreateCdmFactory() override; |
| 150 void GetAdditionalMappedFilesForChildProcess( | 150 void GetAdditionalMappedFilesForChildProcess( |
| 151 const base::CommandLine& command_line, | 151 const base::CommandLine& command_line, |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 | 189 |
| 190 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; | 190 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; |
| 191 | 191 |
| 192 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); | 192 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); |
| 193 }; | 193 }; |
| 194 | 194 |
| 195 } // namespace shell | 195 } // namespace shell |
| 196 } // namespace chromecast | 196 } // namespace chromecast |
| 197 | 197 |
| 198 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 198 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |