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

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

Issue 219523002: Move extension whitelist switch to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cros Created 6 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after
1568 autofill::switches::kDisableIgnoreAutocompleteOff, 1568 autofill::switches::kDisableIgnoreAutocompleteOff,
1569 autofill::switches::kDisableInteractiveAutocomplete, 1569 autofill::switches::kDisableInteractiveAutocomplete,
1570 autofill::switches::kDisablePasswordGeneration, 1570 autofill::switches::kDisablePasswordGeneration,
1571 autofill::switches::kEnableInteractiveAutocomplete, 1571 autofill::switches::kEnableInteractiveAutocomplete,
1572 autofill::switches::kEnablePasswordGeneration, 1572 autofill::switches::kEnablePasswordGeneration,
1573 autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration, 1573 autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration,
1574 extensions::switches::kAllowHTTPBackgroundPage, 1574 extensions::switches::kAllowHTTPBackgroundPage,
1575 extensions::switches::kAllowLegacyExtensionManifests, 1575 extensions::switches::kAllowLegacyExtensionManifests,
1576 extensions::switches::kEnableExperimentalExtensionApis, 1576 extensions::switches::kEnableExperimentalExtensionApis,
1577 extensions::switches::kExtensionsOnChromeURLs, 1577 extensions::switches::kExtensionsOnChromeURLs,
1578 extensions::switches::kWhitelistedExtensionID,
1578 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO 1579 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
1579 // to browser. 1580 // to browser.
1580 switches::kAllowNaClFileHandleAPI, 1581 switches::kAllowNaClFileHandleAPI,
1581 switches::kAppsCheckoutURL, 1582 switches::kAppsCheckoutURL,
1582 switches::kAppsGalleryURL, 1583 switches::kAppsGalleryURL,
1583 switches::kCloudPrintServiceURL, 1584 switches::kCloudPrintServiceURL,
1584 switches::kDisableBundledPpapiFlash, 1585 switches::kDisableBundledPpapiFlash,
1585 switches::kDisableExtensionsResourceWhitelist, 1586 switches::kDisableExtensionsResourceWhitelist,
1586 switches::kDisablePnacl, 1587 switches::kDisablePnacl,
1587 switches::kDisableScriptedPrintThrottling, 1588 switches::kDisableScriptedPrintThrottling,
(...skipping 12 matching lines...) Expand all
1600 switches::kOutOfProcessPdf, 1601 switches::kOutOfProcessPdf,
1601 switches::kPlaybackMode, 1602 switches::kPlaybackMode,
1602 switches::kPpapiFlashArgs, 1603 switches::kPpapiFlashArgs,
1603 switches::kPpapiFlashPath, 1604 switches::kPpapiFlashPath,
1604 switches::kPpapiFlashVersion, 1605 switches::kPpapiFlashVersion,
1605 switches::kProfilingAtStart, 1606 switches::kProfilingAtStart,
1606 switches::kProfilingFile, 1607 switches::kProfilingFile,
1607 switches::kProfilingFlush, 1608 switches::kProfilingFlush,
1608 switches::kRecordMode, 1609 switches::kRecordMode,
1609 switches::kSilentDumpOnDCHECK, 1610 switches::kSilentDumpOnDCHECK,
1610 switches::kWhitelistedExtensionID,
1611 translate::switches::kTranslateSecurityOrigin, 1611 translate::switches::kTranslateSecurityOrigin,
1612 }; 1612 };
1613 1613
1614 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1614 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1615 arraysize(kSwitchNames)); 1615 arraysize(kSwitchNames));
1616 } else if (process_type == switches::kUtilityProcess) { 1616 } else if (process_type == switches::kUtilityProcess) {
1617 static const char* const kSwitchNames[] = { 1617 static const char* const kSwitchNames[] = {
1618 extensions::switches::kAllowHTTPBackgroundPage, 1618 extensions::switches::kAllowHTTPBackgroundPage,
1619 extensions::switches::kEnableExperimentalExtensionApis, 1619 extensions::switches::kEnableExperimentalExtensionApis,
1620 extensions::switches::kExtensionsOnChromeURLs, 1620 extensions::switches::kExtensionsOnChromeURLs,
1621 switches::kWhitelistedExtensionID, 1621 extensions::switches::kWhitelistedExtensionID,
1622 }; 1622 };
1623 1623
1624 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1624 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1625 arraysize(kSwitchNames)); 1625 arraysize(kSwitchNames));
1626 } else if (process_type == switches::kPluginProcess) { 1626 } else if (process_type == switches::kPluginProcess) {
1627 static const char* const kSwitchNames[] = { 1627 static const char* const kSwitchNames[] = {
1628 #if defined(OS_CHROMEOS) 1628 #if defined(OS_CHROMEOS)
1629 chromeos::switches::kLoginProfile, 1629 chromeos::switches::kLoginProfile,
1630 #endif 1630 #endif
1631 switches::kMemoryProfiling, 1631 switches::kMemoryProfiling,
(...skipping 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after
2759 switches::kDisableWebRtcEncryption, 2759 switches::kDisableWebRtcEncryption,
2760 }; 2760 };
2761 to_command_line->CopySwitchesFrom(from_command_line, 2761 to_command_line->CopySwitchesFrom(from_command_line,
2762 kWebRtcDevSwitchNames, 2762 kWebRtcDevSwitchNames,
2763 arraysize(kWebRtcDevSwitchNames)); 2763 arraysize(kWebRtcDevSwitchNames));
2764 } 2764 }
2765 } 2765 }
2766 #endif // defined(ENABLE_WEBRTC) 2766 #endif // defined(ENABLE_WEBRTC)
2767 2767
2768 } // namespace chrome 2768 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698