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 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1336 if (logging::DialogsAreSuppressed()) | 1336 if (logging::DialogsAreSuppressed()) |
1337 command_line->AppendSwitch(switches::kNoErrorDialogs); | 1337 command_line->AppendSwitch(switches::kNoErrorDialogs); |
1338 | 1338 |
1339 std::string process_type = | 1339 std::string process_type = |
1340 command_line->GetSwitchValueASCII(switches::kProcessType); | 1340 command_line->GetSwitchValueASCII(switches::kProcessType); |
1341 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 1341 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
1342 | 1342 |
1343 if (browser_command_line.HasSwitch(switches::kChromeFrame)) | 1343 if (browser_command_line.HasSwitch(switches::kChromeFrame)) |
1344 command_line->AppendSwitch(switches::kChromeFrame); | 1344 command_line->AppendSwitch(switches::kChromeFrame); |
1345 | 1345 |
| 1346 #if defined(ENABLE_IPC_FUZZER) |
| 1347 command_line->CopySwitchFrom(browser_command_line, |
| 1348 switches::kIpcFuzzerTestcase); |
| 1349 #endif |
| 1350 |
1346 if (process_type == switches::kRendererProcess) { | 1351 if (process_type == switches::kRendererProcess) { |
1347 base::FilePath user_data_dir = | 1352 base::FilePath user_data_dir = |
1348 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); | 1353 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); |
1349 if (!user_data_dir.empty()) | 1354 if (!user_data_dir.empty()) |
1350 command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir); | 1355 command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir); |
1351 #if defined(OS_CHROMEOS) | 1356 #if defined(OS_CHROMEOS) |
1352 const std::string& login_profile = | 1357 const std::string& login_profile = |
1353 browser_command_line.GetSwitchValueASCII( | 1358 browser_command_line.GetSwitchValueASCII( |
1354 chromeos::switches::kLoginProfile); | 1359 chromeos::switches::kLoginProfile); |
1355 if (!login_profile.empty()) | 1360 if (!login_profile.empty()) |
(...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2524 #if defined(USE_NSS) | 2529 #if defined(USE_NSS) |
2525 crypto::CryptoModuleBlockingPasswordDelegate* | 2530 crypto::CryptoModuleBlockingPasswordDelegate* |
2526 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2531 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2527 const GURL& url) { | 2532 const GURL& url) { |
2528 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2533 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2529 chrome::kCryptoModulePasswordKeygen, url.host()); | 2534 chrome::kCryptoModulePasswordKeygen, url.host()); |
2530 } | 2535 } |
2531 #endif | 2536 #endif |
2532 | 2537 |
2533 } // namespace chrome | 2538 } // namespace chrome |
OLD | NEW |