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

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

Issue 288053002: Block content scripts from executing until user grants permission (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/extensions/active_script_controller.h » ('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 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 // Please keep this in alphabetical order. 1631 // Please keep this in alphabetical order.
1632 static const char* const kSwitchNames[] = { 1632 static const char* const kSwitchNames[] = {
1633 autofill::switches::kDisableIgnoreAutocompleteOff, 1633 autofill::switches::kDisableIgnoreAutocompleteOff,
1634 autofill::switches::kDisablePasswordGeneration, 1634 autofill::switches::kDisablePasswordGeneration,
1635 autofill::switches::kEnablePasswordGeneration, 1635 autofill::switches::kEnablePasswordGeneration,
1636 autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration, 1636 autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration,
1637 extensions::switches::kAllowHTTPBackgroundPage, 1637 extensions::switches::kAllowHTTPBackgroundPage,
1638 extensions::switches::kAllowLegacyExtensionManifests, 1638 extensions::switches::kAllowLegacyExtensionManifests,
1639 extensions::switches::kEnableExperimentalExtensionApis, 1639 extensions::switches::kEnableExperimentalExtensionApis,
1640 extensions::switches::kExtensionsOnChromeURLs, 1640 extensions::switches::kExtensionsOnChromeURLs,
1641 extensions::switches::kEnableScriptsRequireAction,
not at google - send to devlin 2014/05/23 21:22:26 kEn < kEx
Devlin 2014/05/23 21:49:52 Done.
1641 extensions::switches::kWhitelistedExtensionID, 1642 extensions::switches::kWhitelistedExtensionID,
1642 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO 1643 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
1643 // to browser. 1644 // to browser.
1644 switches::kAllowNaClFileHandleAPI, 1645 switches::kAllowNaClFileHandleAPI,
1645 switches::kAppsCheckoutURL, 1646 switches::kAppsCheckoutURL,
1646 switches::kAppsGalleryURL, 1647 switches::kAppsGalleryURL,
1647 switches::kCloudPrintURL, 1648 switches::kCloudPrintURL,
1648 switches::kCloudPrintXmppEndpoint, 1649 switches::kCloudPrintXmppEndpoint,
1649 switches::kDisableBundledPpapiFlash, 1650 switches::kDisableBundledPpapiFlash,
1650 switches::kDisableExtensionsResourceWhitelist, 1651 switches::kDisableExtensionsResourceWhitelist,
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
2752 switches::kDisableWebRtcEncryption, 2753 switches::kDisableWebRtcEncryption,
2753 }; 2754 };
2754 to_command_line->CopySwitchesFrom(from_command_line, 2755 to_command_line->CopySwitchesFrom(from_command_line,
2755 kWebRtcDevSwitchNames, 2756 kWebRtcDevSwitchNames,
2756 arraysize(kWebRtcDevSwitchNames)); 2757 arraysize(kWebRtcDevSwitchNames));
2757 } 2758 }
2758 } 2759 }
2759 #endif // defined(ENABLE_WEBRTC) 2760 #endif // defined(ENABLE_WEBRTC)
2760 2761
2761 } // namespace chrome 2762 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/active_script_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698