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

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

Issue 2950153002: Improve process launch handle sharing API. (Closed)
Patch Set: Fix Created 3 years, 5 months 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 #include "chromecast/browser/cast_content_browser_client.h" 5 #include "chromecast/browser/cast_content_browser_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 else 528 else
529 return nullptr; 529 return nullptr;
530 base::StringPiece manifest_contents = 530 base::StringPiece manifest_contents =
531 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE); 531 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE);
532 return base::JSONReader::Read(manifest_contents); 532 return base::JSONReader::Read(manifest_contents);
533 } 533 }
534 534
535 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 535 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
536 const base::CommandLine& command_line, 536 const base::CommandLine& command_line,
537 int child_process_id, 537 int child_process_id,
538 content::FileDescriptorInfo* mappings) { 538 content::PosixFileDescriptorInfo* mappings) {
539 #if defined(OS_ANDROID) 539 #if defined(OS_ANDROID)
540 mappings->ShareWithRegion( 540 mappings->ShareWithRegion(
541 kAndroidPakDescriptor, 541 kAndroidPakDescriptor,
542 base::GlobalDescriptors::GetInstance()->Get(kAndroidPakDescriptor), 542 base::GlobalDescriptors::GetInstance()->Get(kAndroidPakDescriptor),
543 base::GlobalDescriptors::GetInstance()->GetRegion(kAndroidPakDescriptor)); 543 base::GlobalDescriptors::GetInstance()->GetRegion(kAndroidPakDescriptor));
544 breakpad::CrashDumpObserver::GetInstance()->BrowserChildProcessStarted( 544 breakpad::CrashDumpObserver::GetInstance()->BrowserChildProcessStarted(
545 child_process_id, mappings); 545 child_process_id, mappings);
546 #else 546 #else
547 int crash_signal_fd = GetCrashSignalFD(command_line); 547 int crash_signal_fd = GetCrashSignalFD(command_line);
548 if (crash_signal_fd >= 0) { 548 if (crash_signal_fd >= 0) {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 process_type, dumps_path, false /* upload */); 596 process_type, dumps_path, false /* upload */);
597 // StartUploaderThread() even though upload is diferred. 597 // StartUploaderThread() even though upload is diferred.
598 // Breakpad-related memory is freed in the uploader thread. 598 // Breakpad-related memory is freed in the uploader thread.
599 crash_handler->StartUploaderThread(); 599 crash_handler->StartUploaderThread();
600 return crash_handler; 600 return crash_handler;
601 } 601 }
602 #endif // !defined(OS_ANDROID) 602 #endif // !defined(OS_ANDROID)
603 603
604 } // namespace shell 604 } // namespace shell
605 } // namespace chromecast 605 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698