Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: chromecast/browser/cast_content_browser_client.h

Issue 2501913002: Change the NaCl loader and broker processes to use the ServiceManager. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 content::ResourceContext* context, 151 content::ResourceContext* context,
152 int render_process_id, 152 int render_process_id,
153 int opener_render_view_id, 153 int opener_render_view_id,
154 int opener_render_frame_id, 154 int opener_render_frame_id,
155 bool* no_javascript_access) override; 155 bool* no_javascript_access) override;
156 void ExposeInterfacesToRenderer( 156 void ExposeInterfacesToRenderer(
157 service_manager::InterfaceRegistry* registry, 157 service_manager::InterfaceRegistry* registry,
158 content::RenderProcessHost* render_process_host) override; 158 content::RenderProcessHost* render_process_host) override;
159 void RegisterInProcessServices(StaticServiceMap* services) override; 159 void RegisterInProcessServices(StaticServiceMap* services) override;
160 std::unique_ptr<base::Value> GetServiceManifestOverlay( 160 std::unique_ptr<base::Value> GetServiceManifestOverlay(
161 const std::string& service_name) override; 161 base::StringPiece service_name) override;
Mark Seaborn 2016/12/19 19:17:05 Could you explain in the commit message why this c
Sam McNally 2016/12/19 23:05:22 Done.
162 #if defined(OS_ANDROID) 162 #if defined(OS_ANDROID)
163 void GetAdditionalMappedFilesForChildProcess( 163 void GetAdditionalMappedFilesForChildProcess(
164 const base::CommandLine& command_line, 164 const base::CommandLine& command_line,
165 int child_process_id, 165 int child_process_id,
166 content::FileDescriptorInfo* mappings, 166 content::FileDescriptorInfo* mappings,
167 std::map<int, base::MemoryMappedFile::Region>* regions) override; 167 std::map<int, base::MemoryMappedFile::Region>* regions) override;
168 #else 168 #else
169 ::media::ScopedAudioManagerPtr CreateAudioManager( 169 ::media::ScopedAudioManagerPtr CreateAudioManager(
170 ::media::AudioLogFactory* audio_log_factory) override; 170 ::media::AudioLogFactory* audio_log_factory) override;
171 std::unique_ptr<::media::CdmFactory> CreateCdmFactory() override; 171 std::unique_ptr<::media::CdmFactory> CreateCdmFactory() override;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 CastBrowserMainParts* cast_browser_main_parts_; 209 CastBrowserMainParts* cast_browser_main_parts_;
210 std::unique_ptr<URLRequestContextFactory> url_request_context_factory_; 210 std::unique_ptr<URLRequestContextFactory> url_request_context_factory_;
211 211
212 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); 212 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
213 }; 213 };
214 214
215 } // namespace shell 215 } // namespace shell
216 } // namespace chromecast 216 } // namespace chromecast
217 217
218 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 218 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_manifest_overlay.json ('k') | chromecast/browser/cast_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698