| 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 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1411 command_line->GetSwitchValueASCII(switches::kProcessType); | 1411 command_line->GetSwitchValueASCII(switches::kProcessType); |
| 1412 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 1412 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
| 1413 | 1413 |
| 1414 static const char* const kCommonSwitchNames[] = { | 1414 static const char* const kCommonSwitchNames[] = { |
| 1415 switches::kChromeFrame, | 1415 switches::kChromeFrame, |
| 1416 switches::kUserDataDir, // Make logs go to the right file. | 1416 switches::kUserDataDir, // Make logs go to the right file. |
| 1417 }; | 1417 }; |
| 1418 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, | 1418 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, |
| 1419 arraysize(kCommonSwitchNames)); | 1419 arraysize(kCommonSwitchNames)); |
| 1420 | 1420 |
| 1421 #if defined(ENABLE_IPC_FUZZER) |
| 1422 static const char* const kIpcFuzzerSwitches[] = { |
| 1423 switches::kIpcFuzzerTestcase, |
| 1424 }; |
| 1425 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, |
| 1426 arraysize(kIpcFuzzerSwitches)); |
| 1427 #endif |
| 1428 |
| 1421 if (process_type == switches::kRendererProcess) { | 1429 if (process_type == switches::kRendererProcess) { |
| 1422 #if defined(OS_CHROMEOS) | 1430 #if defined(OS_CHROMEOS) |
| 1423 const std::string& login_profile = | 1431 const std::string& login_profile = |
| 1424 browser_command_line.GetSwitchValueASCII( | 1432 browser_command_line.GetSwitchValueASCII( |
| 1425 chromeos::switches::kLoginProfile); | 1433 chromeos::switches::kLoginProfile); |
| 1426 if (!login_profile.empty()) | 1434 if (!login_profile.empty()) |
| 1427 command_line->AppendSwitchASCII( | 1435 command_line->AppendSwitchASCII( |
| 1428 chromeos::switches::kLoginProfile, login_profile); | 1436 chromeos::switches::kLoginProfile, login_profile); |
| 1429 #endif | 1437 #endif |
| 1430 | 1438 |
| (...skipping 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2630 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, | 2638 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, |
| 2631 allowed_file_handle_origins_) || | 2639 allowed_file_handle_origins_) || |
| 2632 IsHostAllowedByCommandLine(url, extension_set, | 2640 IsHostAllowedByCommandLine(url, extension_set, |
| 2633 switches::kAllowNaClFileHandleAPI); | 2641 switches::kAllowNaClFileHandleAPI); |
| 2634 #else | 2642 #else |
| 2635 return false; | 2643 return false; |
| 2636 #endif | 2644 #endif |
| 2637 } | 2645 } |
| 2638 | 2646 |
| 2639 } // namespace chrome | 2647 } // namespace chrome |
| OLD | NEW |