diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 16:36:16 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 16:36:16 +0000 |
| commit | 3627b06dd62f0e4748ab57208eac7988c92932a2 (patch) | |
| tree | ea09e487e10a072b1ce2b16c55bf90dfcd466e94 /chrome/common/chrome_switches.h | |
| parent | 2500710027b1034c281b4ef99e0907d96759996b (diff) | |
| download | chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.zip chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.tar.gz chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.tar.bz2 | |
Move click-to-play to about:flags.
XIB changes: Add an outlet |pluginDefaultSettingMatrix_| to ContentSettingsDialogController, hooked up to the associated matrix, to remove the click-to-play radio button.
While I'm at it, clean up a bit:
* Remove the old --disable-click-to-play flag that reverted to the M6 behavior for blocked plugins
* Make ContentExceptionsWindowController use ContentSettingComboModel for the action popup.
* Make HostContentSettingsMapTest use AutoReset to reset command line switches.
BUG=62091
TEST=unit_tests
Review URL: http://codereview.chromium.org/4643007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_switches.h')
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 16e1223..c1dedb2 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -56,7 +56,6 @@ extern const char kDisableAudio[]; extern const char kDisableAuthNegotiateCnameLookup[]; extern const char kDisableBackgroundNetworking[]; extern const char kDisableBackingStoreLimit[]; -extern const char kDisableClickToPlay[]; extern const char kDisableConnectBackupJobs[]; extern const char kDisableContentPrefetch[]; extern const char kDisableCustomJumpList[]; @@ -122,6 +121,7 @@ extern const char kEnableAuthNegotiatePort[]; extern const char kEnableBackgroundMode[]; extern const char kEnableBenchmarking[]; extern const char kEnableClearServerData[]; +extern const char kEnableClickToPlay[]; extern const char kEnableCloudPrintProxy[]; extern const char kEnableCloudPrint[]; extern const char kEnableConfirmToQuit[]; |