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 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1629 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO | 1629 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO |
1630 // to browser. | 1630 // to browser. |
1631 switches::kAllowNaClFileHandleAPI, | 1631 switches::kAllowNaClFileHandleAPI, |
1632 switches::kAppsCheckoutURL, | 1632 switches::kAppsCheckoutURL, |
1633 switches::kAppsGalleryURL, | 1633 switches::kAppsGalleryURL, |
1634 switches::kCloudPrintURL, | 1634 switches::kCloudPrintURL, |
1635 switches::kCloudPrintXmppEndpoint, | 1635 switches::kCloudPrintXmppEndpoint, |
1636 switches::kDisableBundledPpapiFlash, | 1636 switches::kDisableBundledPpapiFlash, |
1637 switches::kDisablePnacl, | 1637 switches::kDisablePnacl, |
1638 switches::kDisableScriptedPrintThrottling, | 1638 switches::kDisableScriptedPrintThrottling, |
| 1639 switches::kEnableAppView, |
1639 switches::kEnableAppWindowControls, | 1640 switches::kEnableAppWindowControls, |
1640 switches::kEnableBenchmarking, | 1641 switches::kEnableBenchmarking, |
1641 switches::kEnableNaCl, | 1642 switches::kEnableNaCl, |
1642 switches::kEnableNaClDebug, | 1643 switches::kEnableNaClDebug, |
1643 switches::kEnableNaClNonSfiMode, | 1644 switches::kEnableNaClNonSfiMode, |
1644 switches::kEnableNetBenchmarking, | 1645 switches::kEnableNetBenchmarking, |
1645 switches::kEnableShowModalDialog, | 1646 switches::kEnableShowModalDialog, |
1646 switches::kEnableStreamlinedHostedApps, | 1647 switches::kEnableStreamlinedHostedApps, |
1647 switches::kEnableWatchdog, | 1648 switches::kEnableWatchdog, |
1648 switches::kEnableWebBasedSignin, | 1649 switches::kEnableWebBasedSignin, |
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2803 switches::kDisableWebRtcEncryption, | 2804 switches::kDisableWebRtcEncryption, |
2804 }; | 2805 }; |
2805 to_command_line->CopySwitchesFrom(from_command_line, | 2806 to_command_line->CopySwitchesFrom(from_command_line, |
2806 kWebRtcDevSwitchNames, | 2807 kWebRtcDevSwitchNames, |
2807 arraysize(kWebRtcDevSwitchNames)); | 2808 arraysize(kWebRtcDevSwitchNames)); |
2808 } | 2809 } |
2809 } | 2810 } |
2810 #endif // defined(ENABLE_WEBRTC) | 2811 #endif // defined(ENABLE_WEBRTC) |
2811 | 2812 |
2812 } // namespace chrome | 2813 } // namespace chrome |
OLD | NEW |