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

Side by Side Diff: content/browser/child_process_launcher_helper_android.cc

Issue 2706933003: webapk: Avoid overwriting default CreationParams
Patch Set: cleanups 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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_helper.h" 5 #include "content/browser/child_process_launcher_helper.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/android/apk_assets.h" 9 #include "base/android/apk_assets.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 } 109 }
110 110
111 ChildProcessLauncherHelper::Process 111 ChildProcessLauncherHelper::Process
112 ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( 112 ChildProcessLauncherHelper::LaunchProcessOnLauncherThread(
113 const base::LaunchOptions& options, 113 const base::LaunchOptions& options,
114 std::unique_ptr<FileDescriptorInfo> files_to_register, 114 std::unique_ptr<FileDescriptorInfo> files_to_register,
115 bool* is_synchronous_launch, 115 bool* is_synchronous_launch,
116 int* launch_result) { 116 int* launch_result) {
117 *is_synchronous_launch = false; 117 *is_synchronous_launch = false;
118 118
119 StartChildProcess(command_line()->argv(), 119 StartChildProcess(
120 child_process_id(), 120 command_line()->argv(), child_process_id(), files_to_register.get(),
121 files_to_register.get(), 121 param_id_, base::Bind(&ChildProcessStartedCallback, RetainedRef(this)));
122 base::Bind(&ChildProcessStartedCallback,
123 RetainedRef(this)));
124 122
125 return Process(); 123 return Process();
126 } 124 }
127 125
128 void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread( 126 void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread(
129 const ChildProcessLauncherHelper::Process& process, 127 const ChildProcessLauncherHelper::Process& process,
130 const base::LaunchOptions& options) { 128 const base::LaunchOptions& options) {
131 } 129 }
132 130
133 // static 131 // static
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 } 168 }
171 169
172 // static 170 // static
173 base::File OpenFileToShare(const base::FilePath& path, 171 base::File OpenFileToShare(const base::FilePath& path,
174 base::MemoryMappedFile::Region* region) { 172 base::MemoryMappedFile::Region* region) {
175 return base::File(base::android::OpenApkAsset(path.value(), region)); 173 return base::File(base::android::OpenApkAsset(path.value(), region));
176 } 174 }
177 175
178 } // namespace internal 176 } // namespace internal
179 } // namespace content 177 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698