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

Side by Side Diff: content/browser/child_process_launcher.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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "content/browser/child_process_launcher.h" 5 #include "content/browser/child_process_launcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 GetProcess(), exit_code, wait); 143 GetProcess(), exit_code, wait);
144 } 144 }
145 145
146 // static 146 // static
147 bool ChildProcessLauncher::TerminateProcess(const base::Process& process, 147 bool ChildProcessLauncher::TerminateProcess(const base::Process& process,
148 int exit_code, 148 int exit_code,
149 bool wait) { 149 bool wait) {
150 return ChildProcessLauncherHelper::TerminateProcess(process, exit_code, wait); 150 return ChildProcessLauncherHelper::TerminateProcess(process, exit_code, wait);
151 } 151 }
152 152
153 // static
154 void ChildProcessLauncher::SetRegisteredFilesForService(
155 const std::string& service_name,
156 catalog::RequiredFileMap required_files) {
157 ChildProcessLauncherHelper::SetRegisteredFilesForService(
158 service_name, std::move(required_files));
159 }
160
153 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest( 161 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest(
154 Client* client) { 162 Client* client) {
155 Client* ret = client_; 163 Client* ret = client_;
156 client_ = client; 164 client_ = client;
157 return ret; 165 return ret;
158 } 166 }
159 167
160 } // namespace content 168 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/child_process_launcher.h ('k') | content/browser/child_process_launcher_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698