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

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

Issue 1425113003: media: Register MojoMediaApplication to run in Utility process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 1 month 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
« no previous file with comments | « chromecast/browser/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chromecast/browser/cast_content_browser_client.h" 5 #include "chromecast/browser/cast_content_browser_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 int opener_render_frame_id, 352 int opener_render_frame_id,
353 bool* no_javascript_access) { 353 bool* no_javascript_access) {
354 *no_javascript_access = true; 354 *no_javascript_access = true;
355 return false; 355 return false;
356 } 356 }
357 357
358 void CastContentBrowserClient::RegisterUnsandboxedOutOfProcessMojoApplications( 358 void CastContentBrowserClient::RegisterUnsandboxedOutOfProcessMojoApplications(
359 std::map<GURL, base::string16>* apps) { 359 std::map<GURL, base::string16>* apps) {
360 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) 360 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
361 apps->insert(std::make_pair(GURL("mojo:media"), 361 apps->insert(std::make_pair(GURL("mojo:media"),
362 base::UTF8ToUTF16("Media Renderer"))); 362 base::ASCIIToUTF16("Media App")));
363 #endif 363 #endif
364 } 364 }
365 365
366 #if defined(OS_ANDROID) 366 #if defined(OS_ANDROID)
367 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 367 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
368 const base::CommandLine& command_line, 368 const base::CommandLine& command_line,
369 int child_process_id, 369 int child_process_id,
370 content::FileDescriptorInfo* mappings, 370 content::FileDescriptorInfo* mappings,
371 std::map<int, base::MemoryMappedFile::Region>* regions) { 371 std::map<int, base::MemoryMappedFile::Region>* regions) {
372 mappings->Share( 372 mappings->Share(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 process_type, dumps_path, false /* upload */); 444 process_type, dumps_path, false /* upload */);
445 // StartUploaderThread() even though upload is diferred. 445 // StartUploaderThread() even though upload is diferred.
446 // Breakpad-related memory is freed in the uploader thread. 446 // Breakpad-related memory is freed in the uploader thread.
447 crash_handler->StartUploaderThread(); 447 crash_handler->StartUploaderThread();
448 return crash_handler; 448 return crash_handler;
449 } 449 }
450 #endif // !defined(OS_ANDROID) 450 #endif // !defined(OS_ANDROID)
451 451
452 } // namespace shell 452 } // namespace shell
453 } // namespace chromecast 453 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698