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