Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 392023002: Remove disable-pnacl flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after
1637 extensions::switches::kExtensionsOnChromeURLs, 1637 extensions::switches::kExtensionsOnChromeURLs,
1638 extensions::switches::kWhitelistedExtensionID, 1638 extensions::switches::kWhitelistedExtensionID,
1639 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO 1639 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
1640 // to browser. 1640 // to browser.
1641 switches::kAllowNaClFileHandleAPI, 1641 switches::kAllowNaClFileHandleAPI,
1642 switches::kAppsCheckoutURL, 1642 switches::kAppsCheckoutURL,
1643 switches::kAppsGalleryURL, 1643 switches::kAppsGalleryURL,
1644 switches::kCloudPrintURL, 1644 switches::kCloudPrintURL,
1645 switches::kCloudPrintXmppEndpoint, 1645 switches::kCloudPrintXmppEndpoint,
1646 switches::kDisableBundledPpapiFlash, 1646 switches::kDisableBundledPpapiFlash,
1647 switches::kDisablePnacl,
1648 switches::kDisableScriptedPrintThrottling, 1647 switches::kDisableScriptedPrintThrottling,
1649 switches::kEnableAppView, 1648 switches::kEnableAppView,
1650 switches::kEnableAppWindowControls, 1649 switches::kEnableAppWindowControls,
1651 switches::kEnableBenchmarking, 1650 switches::kEnableBenchmarking,
1652 switches::kEnableNaCl, 1651 switches::kEnableNaCl,
1653 switches::kEnableNaClDebug, 1652 switches::kEnableNaClDebug,
1654 switches::kEnableNaClNonSfiMode, 1653 switches::kEnableNaClNonSfiMode,
1655 switches::kEnableNetBenchmarking, 1654 switches::kEnableNetBenchmarking,
1656 switches::kEnableShowModalDialog, 1655 switches::kEnableShowModalDialog,
1657 switches::kEnableStreamlinedHostedApps, 1656 switches::kEnableStreamlinedHostedApps,
(...skipping 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after
2896 switches::kDisableWebRtcEncryption, 2895 switches::kDisableWebRtcEncryption,
2897 }; 2896 };
2898 to_command_line->CopySwitchesFrom(from_command_line, 2897 to_command_line->CopySwitchesFrom(from_command_line,
2899 kWebRtcDevSwitchNames, 2898 kWebRtcDevSwitchNames,
2900 arraysize(kWebRtcDevSwitchNames)); 2899 arraysize(kWebRtcDevSwitchNames));
2901 } 2900 }
2902 } 2901 }
2903 #endif // defined(ENABLE_WEBRTC) 2902 #endif // defined(ENABLE_WEBRTC)
2904 2903
2905 } // namespace chrome 2904 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698