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/aw_safe_browsing_config_helper.h" | 10 #include "android_webview/browser/aw_safe_browsing_config_helper.h" |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 pak_fd = global_descriptors->Get(pak_info.first); | 199 pak_fd = global_descriptors->Get(pak_info.first); |
200 pak_region = global_descriptors->GetRegion(pak_info.first); | 200 pak_region = global_descriptors->GetRegion(pak_info.first); |
201 ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion( | 201 ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion( |
202 base::File(pak_fd), pak_region, pak_info.second); | 202 base::File(pak_fd), pak_region, pak_info.second); |
203 } | 203 } |
204 | 204 |
205 crash_signal_fd = | 205 crash_signal_fd = |
206 global_descriptors->Get(kAndroidWebViewCrashSignalDescriptor); | 206 global_descriptors->Get(kAndroidWebViewCrashSignalDescriptor); |
207 } | 207 } |
208 if (process_type.empty()) { | 208 if (process_type.empty()) { |
209 if (command_line.HasSwitch(switches::kSingleProcess)) { | 209 if (command_line.HasSwitch(switches::kWebViewSandboxedRenderer)) { |
| 210 process_type = breakpad::kBrowserProcessType; |
| 211 } else { |
210 process_type = breakpad::kWebViewSingleProcessType; | 212 process_type = breakpad::kWebViewSingleProcessType; |
211 } else { | |
212 process_type = breakpad::kBrowserProcessType; | |
213 } | 213 } |
214 } | 214 } |
215 | 215 |
216 crash_reporter::EnableCrashReporter(process_type, crash_signal_fd); | 216 crash_reporter::EnableCrashReporter(process_type, crash_signal_fd); |
217 | 217 |
218 base::android::BuildInfo* android_build_info = | 218 base::android::BuildInfo* android_build_info = |
219 base::android::BuildInfo::GetInstance(); | 219 base::android::BuildInfo::GetInstance(); |
220 base::debug::SetCrashKeyValue(crash_keys::kAppPackageName, | 220 base::debug::SetCrashKeyValue(crash_keys::kAppPackageName, |
221 android_build_info->package_name()); | 221 android_build_info->package_name()); |
222 base::debug::SetCrashKeyValue(crash_keys::kAppPackageVersionCode, | 222 base::debug::SetCrashKeyValue(crash_keys::kAppPackageVersionCode, |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 | 294 |
295 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { | 295 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { |
296 return new AwWebPreferencesPopulaterImpl(); | 296 return new AwWebPreferencesPopulaterImpl(); |
297 } | 297 } |
298 | 298 |
299 AwLocaleManager* AwMainDelegate::CreateAwLocaleManager() { | 299 AwLocaleManager* AwMainDelegate::CreateAwLocaleManager() { |
300 return new AwLocaleManagerImpl(); | 300 return new AwLocaleManagerImpl(); |
301 } | 301 } |
302 | 302 |
303 } // namespace android_webview | 303 } // namespace android_webview |
OLD | NEW |