diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 09:36:11 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 09:36:11 +0000 |
| commit | 5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4 (patch) | |
| tree | dfe9bd08165762794475a41433f7d58ebdc77c8f /chrome/browser/content_settings | |
| parent | cd81cee36f9a7449f7a04e3015aaf74c6be5a9c0 (diff) | |
| download | chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.zip chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.tar.gz chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.tar.bz2 | |
Revert 119306 - Turn web intents build flag on.
Move the command-line flag to default-on.
(Revert of 119284 : https://chromiumcodereview.appspot.com/9212036)
IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.
R=jhawkins@chromium.org
BUG=111135
TEST=None
Review URL: http://codereview.chromium.org/9271084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/host_content_settings_map.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 82eacba..e73553a 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -311,8 +311,7 @@ bool HostContentSettingsMap::IsSettingAllowedForType( ContentSetting setting, ContentSettingsType content_type) { // Intents content settings are hidden behind a switch for now. if (content_type == CONTENT_SETTINGS_TYPE_INTENTS && - !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableWebIntents)) + CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents)) return false; // BLOCK semantics are not implemented for fullscreen. |