| 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1630 switches::kEnableBenchmarking, | 1630 switches::kEnableBenchmarking, |
| 1631 switches::kEnableNaCl, | 1631 switches::kEnableNaCl, |
| 1632 #if !defined(DISABLE_NACL) | 1632 #if !defined(DISABLE_NACL) |
| 1633 switches::kEnableNaClDebug, | 1633 switches::kEnableNaClDebug, |
| 1634 switches::kEnableNaClNonSfiMode, | 1634 switches::kEnableNaClNonSfiMode, |
| 1635 #endif | 1635 #endif |
| 1636 switches::kEnableNetBenchmarking, | 1636 switches::kEnableNetBenchmarking, |
| 1637 switches::kEnableNewBookmarkApps, | 1637 switches::kEnableNewBookmarkApps, |
| 1638 #if defined(OS_ANDROID) | 1638 #if defined(OS_ANDROID) |
| 1639 switches::kEnableOfflinePagesAsBookmarks, | 1639 switches::kEnableOfflinePagesAsBookmarks, |
| 1640 switches::kEnableOfflinePagesBackgroundLoading, |
| 1640 #endif | 1641 #endif |
| 1641 #if !defined(DISABLE_NACL) | 1642 #if !defined(DISABLE_NACL) |
| 1642 switches::kForcePNaClSubzero, | 1643 switches::kForcePNaClSubzero, |
| 1643 #endif | 1644 #endif |
| 1644 switches::kJavaScriptHarmony, | 1645 switches::kJavaScriptHarmony, |
| 1645 switches::kMessageLoopHistogrammer, | 1646 switches::kMessageLoopHistogrammer, |
| 1646 switches::kPpapiFlashArgs, | 1647 switches::kPpapiFlashArgs, |
| 1647 switches::kPpapiFlashPath, | 1648 switches::kPpapiFlashPath, |
| 1648 switches::kPpapiFlashVersion, | 1649 switches::kPpapiFlashVersion, |
| 1649 switches::kProfilingAtStart, | 1650 switches::kProfilingAtStart, |
| (...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2943 if (channel <= kMaxDisableEncryptionChannel) { | 2944 if (channel <= kMaxDisableEncryptionChannel) { |
| 2944 static const char* const kWebRtcDevSwitchNames[] = { | 2945 static const char* const kWebRtcDevSwitchNames[] = { |
| 2945 switches::kDisableWebRtcEncryption, | 2946 switches::kDisableWebRtcEncryption, |
| 2946 }; | 2947 }; |
| 2947 to_command_line->CopySwitchesFrom(from_command_line, | 2948 to_command_line->CopySwitchesFrom(from_command_line, |
| 2948 kWebRtcDevSwitchNames, | 2949 kWebRtcDevSwitchNames, |
| 2949 arraysize(kWebRtcDevSwitchNames)); | 2950 arraysize(kWebRtcDevSwitchNames)); |
| 2950 } | 2951 } |
| 2951 } | 2952 } |
| 2952 #endif // defined(ENABLE_WEBRTC) | 2953 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |