chrome/browser/ui/webui/options/clear_browser_data_handler.cc - Issue 8223004: Check whether clearing LSO data is supported in clients of the BrowsingDataRemover.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Issue 8223004: Check whether clearing LSO data is supported in clients of the BrowsingDataRemover. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit test Created 9 years, 2 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc

index c4223566b070c6087d86ebaeb9f790b6007a4abf..acca585d654c2c8c1e9cc606d1c004fa63906505 100644

--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc

+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc

@@ -103,8 +103,13 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {

remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;

if (prefs->GetBoolean(prefs::kDeleteCache))

remove_mask |= BrowsingDataRemover::REMOVE_CACHE;

- if (prefs->GetBoolean(prefs::kDeleteCookies))

- remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA;

+ if (prefs->GetBoolean(prefs::kDeleteCookies)) {

+ int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA;

+ // Don't try to clear LSO data if it's not supported.

+ if (!*clear_plugin_lso_data_enabled_)

+ site_data_mask &= ~BrowsingDataRemover::REMOVE_LSO_DATA;

+ remove_mask |= site_data_mask;

+ }

if (prefs->GetBoolean(prefs::kDeletePasswords))

remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;

if (prefs->GetBoolean(prefs::kDeleteFormData))

« no previous file with comments | « chrome/browser/extensions/extension_clear_api.cc ('k') | no next file » | no next file with comments »