| 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 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1308 | 1308 |
| 1309 static const char* const kCommonSwitchNames[] = { | 1309 static const char* const kCommonSwitchNames[] = { |
| 1310 switches::kUserAgent, | 1310 switches::kUserAgent, |
| 1311 switches::kUserDataDir, // Make logs go to the right file. | 1311 switches::kUserDataDir, // Make logs go to the right file. |
| 1312 }; | 1312 }; |
| 1313 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, | 1313 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, |
| 1314 arraysize(kCommonSwitchNames)); | 1314 arraysize(kCommonSwitchNames)); |
| 1315 | 1315 |
| 1316 #if defined(ENABLE_IPC_FUZZER) | 1316 #if defined(ENABLE_IPC_FUZZER) |
| 1317 static const char* const kIpcFuzzerSwitches[] = { | 1317 static const char* const kIpcFuzzerSwitches[] = { |
| 1318 switches::kIpcFuzzerTestcase, | 1318 switches::kIpcDumpDirectory, |
| 1319 switches::kIpcFuzzerTestcase, |
| 1319 }; | 1320 }; |
| 1320 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, | 1321 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, |
| 1321 arraysize(kIpcFuzzerSwitches)); | 1322 arraysize(kIpcFuzzerSwitches)); |
| 1322 #endif | 1323 #endif |
| 1323 | 1324 |
| 1324 #if defined(OS_CHROMEOS) | 1325 #if defined(OS_CHROMEOS) |
| 1325 // On Chrome OS need to pass primary user homedir (in multi-profiles session). | 1326 // On Chrome OS need to pass primary user homedir (in multi-profiles session). |
| 1326 base::FilePath homedir; | 1327 base::FilePath homedir; |
| 1327 PathService::Get(base::DIR_HOME, &homedir); | 1328 PathService::Get(base::DIR_HOME, &homedir); |
| 1328 command_line->AppendSwitchASCII(chromeos::switches::kHomedir, | 1329 command_line->AppendSwitchASCII(chromeos::switches::kHomedir, |
| (...skipping 1316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2645 switches::kDisableWebRtcEncryption, | 2646 switches::kDisableWebRtcEncryption, |
| 2646 }; | 2647 }; |
| 2647 to_command_line->CopySwitchesFrom(from_command_line, | 2648 to_command_line->CopySwitchesFrom(from_command_line, |
| 2648 kWebRtcDevSwitchNames, | 2649 kWebRtcDevSwitchNames, |
| 2649 arraysize(kWebRtcDevSwitchNames)); | 2650 arraysize(kWebRtcDevSwitchNames)); |
| 2650 } | 2651 } |
| 2651 } | 2652 } |
| 2652 #endif // defined(ENABLE_WEBRTC) | 2653 #endif // defined(ENABLE_WEBRTC) |
| 2653 | 2654 |
| 2654 } // namespace chrome | 2655 } // namespace chrome |
| OLD | NEW |