diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 17:17:23 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 17:17:23 +0000 |
| commit | dceaa916f0c01a0d9f87ef77c91dc6bbce3b1979 (patch) | |
| tree | 970f63845d20dbea7417c86dd71103a7de4f356d /chrome_frame | |
| parent | 2ea29675ed3b7da1d06214b9c272e531344a2f25 (diff) | |
| download | chromium_src-dceaa916f0c01a0d9f87ef77c91dc6bbce3b1979.zip chromium_src-dceaa916f0c01a0d9f87ef77c91dc6bbce3b1979.tar.gz chromium_src-dceaa916f0c01a0d9f87ef77c91dc6bbce3b1979.tar.bz2 | |
Rename REMOVE_COOKIES to REMOVE_SITE_DATA (which will explicitly include REMOVE_LSO_DATA).
There's no case in the current codebase when we want to remove _only_ LSO data, and no case where we want to remove cookies, but _not_ LSO data. There are many instances of building removal masks that binary-OR REMOVE_LSO_DATA and REMOVE_COOKIES together; this CL formalizes that by dropping the extra enum value.
Moreover, we talk about "cookies" differently when targeting users on the one hand, and developers on the other. REMOVE_COOKIES is a developer-facing name with a user-facing value, which is confusing. Renaming the current functionality to REMOVE_SITE_DATA is much more explicit, and will enable us to _just_ remove cookies at some point in the future via a REMOVE_COOKIES that actually means cookies.
REMOVE_SITE_DATA has exactly the same semantics that REMOVE_COOKIES used to, with one exception: REMOVE_COOKIES included deleting cached strict transport security values. This functionality has been moved to REMOVE_CACHE.
As a drive-by, this CL also moves a check against the kClearPluginLSODataEnabled pref out of webui (ClearBrowsingDataHandler) and into the BrowsingDataRemover itself, where it seems more likely to be effective.
BUG=92628, 94334
TEST=Nothing but removal cached transport-security values should change.
Review URL: http://codereview.chromium.org/7717023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/delete_chrome_history.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc index 419cfc9..e2476af 100644 --- a/chrome_frame/delete_chrome_history.cc +++ b/chrome_frame/delete_chrome_history.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -80,7 +80,7 @@ STDMETHODIMP DeleteChromeHistory::DeleteBrowsingHistory(DWORD flags) { } if (flags & DELETE_BROWSING_HISTORY_COOKIES) - remove_mask_ |= BrowsingDataRemover::REMOVE_COOKIES; + remove_mask_ |= BrowsingDataRemover::REMOVE_SITE_DATA; if (flags & DELETE_BROWSING_HISTORY_TIF) remove_mask_ |= BrowsingDataRemover::REMOVE_CACHE; if (flags & DELETE_BROWSING_HISTORY_FORMDATA) |