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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1286 return !url.SchemeIs(chrome::kChromeNativeScheme); | 1286 return !url.SchemeIs(chrome::kChromeNativeScheme); |
1287 } | 1287 } |
1288 | 1288 |
1289 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName( | 1289 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName( |
1290 const std::string& alias_name) { | 1290 const std::string& alias_name) { |
1291 return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name); | 1291 return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name); |
1292 } | 1292 } |
1293 | 1293 |
1294 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( | 1294 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( |
1295 CommandLine* command_line, int child_process_id) { | 1295 CommandLine* command_line, int child_process_id) { |
1296 #if defined(USE_LINUX_BREAKPAD) | 1296 #if defined(OS_MACOSX) |
1297 if (IsCrashReporterEnabled()) { | |
1298 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, | |
1299 child_process_logging::GetClientId()); | |
1300 } | |
1301 #elif defined(OS_POSIX) | |
1297 if (IsCrashReporterEnabled()) { | 1302 if (IsCrashReporterEnabled()) { |
1298 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, | 1303 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, |
1299 child_process_logging::GetClientId() + "," + base::GetLinuxDistro()); | 1304 child_process_logging::GetClientId() + "," + base::GetLinuxDistro()); |
1300 } | 1305 } |
1301 #elif defined(OS_MACOSX) | 1306 |
1302 if (IsCrashReporterEnabled()) { | |
1303 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, | |
1304 child_process_logging::GetClientId()); | |
1305 } | |
1306 #endif // OS_MACOSX | 1307 #endif // OS_MACOSX |
Sam Clegg
2013/07/15 23:28:30
Does this comment need updating?
| |
1307 | 1308 |
1308 if (logging::DialogsAreSuppressed()) | 1309 if (logging::DialogsAreSuppressed()) |
1309 command_line->AppendSwitch(switches::kNoErrorDialogs); | 1310 command_line->AppendSwitch(switches::kNoErrorDialogs); |
1310 | 1311 |
1311 std::string process_type = | 1312 std::string process_type = |
1312 command_line->GetSwitchValueASCII(switches::kProcessType); | 1313 command_line->GetSwitchValueASCII(switches::kProcessType); |
1313 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 1314 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
1314 | 1315 |
1315 if (browser_command_line.HasSwitch(switches::kChromeFrame)) | 1316 if (browser_command_line.HasSwitch(switches::kChromeFrame)) |
1316 command_line->AppendSwitch(switches::kChromeFrame); | 1317 command_line->AppendSwitch(switches::kChromeFrame); |
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2395 mappings->push_back(FileDescriptorInfo(kAndroidLocalePakDescriptor, | 2396 mappings->push_back(FileDescriptorInfo(kAndroidLocalePakDescriptor, |
2396 FileDescriptor(f, true))); | 2397 FileDescriptor(f, true))); |
2397 | 2398 |
2398 base::FilePath resources_pack_path; | 2399 base::FilePath resources_pack_path; |
2399 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); | 2400 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); |
2400 f = base::CreatePlatformFile(resources_pack_path, flags, NULL, NULL); | 2401 f = base::CreatePlatformFile(resources_pack_path, flags, NULL, NULL); |
2401 DCHECK(f != base::kInvalidPlatformFileValue); | 2402 DCHECK(f != base::kInvalidPlatformFileValue); |
2402 mappings->push_back(FileDescriptorInfo(kAndroidUIResourcesPakDescriptor, | 2403 mappings->push_back(FileDescriptorInfo(kAndroidUIResourcesPakDescriptor, |
2403 FileDescriptor(f, true))); | 2404 FileDescriptor(f, true))); |
2404 | 2405 |
2405 #if defined(USE_LINUX_BREAKPAD) | |
2406 if (IsCrashReporterEnabled()) { | 2406 if (IsCrashReporterEnabled()) { |
2407 f = CrashDumpManager::GetInstance()->CreateMinidumpFile(child_process_id); | 2407 f = CrashDumpManager::GetInstance()->CreateMinidumpFile(child_process_id); |
2408 if (f == base::kInvalidPlatformFileValue) { | 2408 if (f == base::kInvalidPlatformFileValue) { |
2409 LOG(ERROR) << "Failed to create file for minidump, crash reporting will " | 2409 LOG(ERROR) << "Failed to create file for minidump, crash reporting will " |
2410 "be disabled for this process."; | 2410 "be disabled for this process."; |
2411 } else { | 2411 } else { |
2412 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor, | 2412 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor, |
2413 FileDescriptor(f, true))); | 2413 FileDescriptor(f, true))); |
2414 } | 2414 } |
2415 } | 2415 } |
2416 #endif // defined(USE_LINUX_BREAKPAD) | |
2417 | 2416 |
2418 #else | 2417 #else |
2419 int crash_signal_fd = GetCrashSignalFD(command_line); | 2418 int crash_signal_fd = GetCrashSignalFD(command_line); |
2420 if (crash_signal_fd >= 0) { | 2419 if (crash_signal_fd >= 0) { |
2421 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, | 2420 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, |
2422 FileDescriptor(crash_signal_fd, | 2421 FileDescriptor(crash_signal_fd, |
2423 false))); | 2422 false))); |
2424 } | 2423 } |
2425 #endif // defined(OS_ANDROID) | 2424 #endif // defined(OS_ANDROID) |
2426 } | 2425 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2462 #if defined(USE_NSS) | 2461 #if defined(USE_NSS) |
2463 crypto::CryptoModuleBlockingPasswordDelegate* | 2462 crypto::CryptoModuleBlockingPasswordDelegate* |
2464 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2463 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2465 const GURL& url) { | 2464 const GURL& url) { |
2466 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2465 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2467 chrome::kCryptoModulePasswordKeygen, url.host()); | 2466 chrome::kCryptoModulePasswordKeygen, url.host()); |
2468 } | 2467 } |
2469 #endif | 2468 #endif |
2470 | 2469 |
2471 } // namespace chrome | 2470 } // namespace chrome |
OLD | NEW |