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 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1461 return group == "Enabled"; | 1461 return group == "Enabled"; |
1462 } | 1462 } |
1463 | 1463 |
1464 } // namespace | 1464 } // namespace |
1465 | 1465 |
1466 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( | 1466 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( |
1467 CommandLine* command_line, int child_process_id) { | 1467 CommandLine* command_line, int child_process_id) { |
1468 #if defined(OS_POSIX) | 1468 #if defined(OS_POSIX) |
1469 if (breakpad::IsCrashReporterEnabled()) { | 1469 if (breakpad::IsCrashReporterEnabled()) { |
1470 std::string enable_crash_reporter; | 1470 std::string enable_crash_reporter; |
1471 GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); | 1471 GoogleUpdateSettings::LoadMetricsClientId(&enable_crash_reporter); |
1472 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, | 1472 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, |
1473 enable_crash_reporter); | 1473 enable_crash_reporter); |
1474 } | 1474 } |
1475 #endif // defined(OS_POSIX) | 1475 #endif // defined(OS_POSIX) |
1476 | 1476 |
1477 if (logging::DialogsAreSuppressed()) | 1477 if (logging::DialogsAreSuppressed()) |
1478 command_line->AppendSwitch(switches::kNoErrorDialogs); | 1478 command_line->AppendSwitch(switches::kNoErrorDialogs); |
1479 | 1479 |
1480 std::string process_type = | 1480 std::string process_type = |
1481 command_line->GetSwitchValueASCII(switches::kProcessType); | 1481 command_line->GetSwitchValueASCII(switches::kProcessType); |
(...skipping 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2801 switches::kDisableWebRtcEncryption, | 2801 switches::kDisableWebRtcEncryption, |
2802 }; | 2802 }; |
2803 to_command_line->CopySwitchesFrom(from_command_line, | 2803 to_command_line->CopySwitchesFrom(from_command_line, |
2804 kWebRtcDevSwitchNames, | 2804 kWebRtcDevSwitchNames, |
2805 arraysize(kWebRtcDevSwitchNames)); | 2805 arraysize(kWebRtcDevSwitchNames)); |
2806 } | 2806 } |
2807 } | 2807 } |
2808 #endif // defined(ENABLE_WEBRTC) | 2808 #endif // defined(ENABLE_WEBRTC) |
2809 | 2809 |
2810 } // namespace chrome | 2810 } // namespace chrome |
OLD | NEW |