OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "android_webview/lib/main/aw_main_delegate.h" | 5 #include "android_webview/lib/main/aw_main_delegate.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "android_webview/browser/aw_content_browser_client.h" | 9 #include "android_webview/browser/aw_content_browser_client.h" |
10 #include "android_webview/browser/browser_view_renderer.h" | 10 #include "android_webview/browser/browser_view_renderer.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 pak_region = | 171 pak_region = |
172 global_descriptors->GetRegion(kAndroidWebViewMainPakDescriptor); | 172 global_descriptors->GetRegion(kAndroidWebViewMainPakDescriptor); |
173 ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion( | 173 ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion( |
174 base::File(pak_fd), pak_region, ui::SCALE_FACTOR_NONE); | 174 base::File(pak_fd), pak_region, ui::SCALE_FACTOR_NONE); |
175 crash_signal_fd = | 175 crash_signal_fd = |
176 global_descriptors->Get(kAndroidWebViewCrashSignalDescriptor); | 176 global_descriptors->Get(kAndroidWebViewCrashSignalDescriptor); |
177 } | 177 } |
178 if (process_type.empty() && | 178 if (process_type.empty() && |
179 command_line.HasSwitch(switches::kSingleProcess)) { | 179 command_line.HasSwitch(switches::kSingleProcess)) { |
180 // "webview" has a special treatment in breakpad_linux.cc. | 180 // "webview" has a special treatment in breakpad_linux.cc. |
181 process_type = "webview"; | 181 process_type = "webview-singleprocess"; |
182 } | 182 } |
183 | 183 |
184 crash_reporter::EnableMicrodumpCrashReporter(process_type, crash_signal_fd); | 184 crash_reporter::EnableMicrodumpCrashReporter(process_type, crash_signal_fd); |
185 } | 185 } |
186 | 186 |
187 int AwMainDelegate::RunProcess( | 187 int AwMainDelegate::RunProcess( |
188 const std::string& process_type, | 188 const std::string& process_type, |
189 const content::MainFunctionParams& main_function_params) { | 189 const content::MainFunctionParams& main_function_params) { |
190 if (process_type.empty()) { | 190 if (process_type.empty()) { |
191 AwBrowserDependencyFactoryImpl::InstallInstance(); | 191 AwBrowserDependencyFactoryImpl::InstallInstance(); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 #if defined(VIDEO_HOLE) | 267 #if defined(VIDEO_HOLE) |
268 content::ExternalVideoSurfaceContainer* | 268 content::ExternalVideoSurfaceContainer* |
269 AwMainDelegate::CreateExternalVideoSurfaceContainer( | 269 AwMainDelegate::CreateExternalVideoSurfaceContainer( |
270 content::WebContents* web_contents) { | 270 content::WebContents* web_contents) { |
271 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( | 271 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( |
272 web_contents); | 272 web_contents); |
273 } | 273 } |
274 #endif | 274 #endif |
275 | 275 |
276 } // namespace android_webview | 276 } // namespace android_webview |
OLD | NEW |