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

Unified Diff: content/browser/child_process_launcher_helper_mac.cc

Issue 2684433003: Files required by a service now listed in manifest. (Closed)
Patch Set: Fix build. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/child_process_launcher_helper_mac.cc
diff --git a/content/browser/child_process_launcher_helper_mac.cc b/content/browser/child_process_launcher_helper_mac.cc
index 9a8bda0470ede897e8144e096bd4529eacdbf149..0e435086af02f91b74fe1dcecb2405fb182536f5 100644
--- a/content/browser/child_process_launcher_helper_mac.cc
+++ b/content/browser/child_process_launcher_helper_mac.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/memory/ptr_util.h"
+#include "base/path_service.h"
#include "base/posix/global_descriptors.h"
#include "content/browser/bootstrap_sandbox_manager_mac.h"
#include "content/browser/child_process_launcher.h"
@@ -31,8 +32,10 @@ void ChildProcessLauncherHelper::BeforeLaunchOnClientThread() {
std::unique_ptr<FileDescriptorInfo>
ChildProcessLauncherHelper::GetFilesToMap() {
DCHECK_CURRENTLY_ON(BrowserThread::PROCESS_LAUNCHER);
- return CreateDefaultPosixFilesToMap(*command_line(), child_process_id(),
- mojo_client_handle());
+ return CreateDefaultPosixFilesToMap(
+ child_process_id(), mojo_client_handle(),
+ false /* include_service_required_files */, GetProcessType(),
+ command_line());
}
void ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
@@ -146,5 +149,22 @@ void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread(
process.SetProcessBackgrounded(MachBroker::GetInstance(), background);
}
+// static
+void ChildProcessLauncherHelper::SetRegisteredFilesForService(
+ const std::string& service_name,
+ catalog::RequiredFileMap required_files) {
+ // No file passing from the manifest on Mac yet.
+ DCHECK(required_files.empty());
+}
+
+// static
+base::File OpenFileToShare(const base::FilePath& path,
+ base::MemoryMappedFile::Region* region) {
+ // Not used yet (until required files are described in the service manifest on
+ // Mac).
+ NOTREACHED();
+ return base::File();
+}
+
} // namespace internal
} // namespace content
« no previous file with comments | « content/browser/child_process_launcher_helper_linux.cc ('k') | content/browser/child_process_launcher_helper_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698