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

Side by Side Diff: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Issue 8907018: Renaming REMOVE_LSO_DATA to REMOVE_PLUGIN_DATA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « chrome/browser/extensions/extension_clear_api.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/webui/options/clear_browser_data_handler.h" 5 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 if (prefs->GetBoolean(prefs::kDeleteBrowsingHistory)) 100 if (prefs->GetBoolean(prefs::kDeleteBrowsingHistory))
101 remove_mask |= BrowsingDataRemover::REMOVE_HISTORY; 101 remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
102 if (prefs->GetBoolean(prefs::kDeleteDownloadHistory)) 102 if (prefs->GetBoolean(prefs::kDeleteDownloadHistory))
103 remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS; 103 remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
104 if (prefs->GetBoolean(prefs::kDeleteCache)) 104 if (prefs->GetBoolean(prefs::kDeleteCache))
105 remove_mask |= BrowsingDataRemover::REMOVE_CACHE; 105 remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
106 if (prefs->GetBoolean(prefs::kDeleteCookies)) { 106 if (prefs->GetBoolean(prefs::kDeleteCookies)) {
107 int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA; 107 int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
108 // Don't try to clear LSO data if it's not supported. 108 // Don't try to clear LSO data if it's not supported.
109 if (!*clear_plugin_lso_data_enabled_) 109 if (!*clear_plugin_lso_data_enabled_)
110 site_data_mask &= ~BrowsingDataRemover::REMOVE_LSO_DATA; 110 site_data_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
111 remove_mask |= site_data_mask; 111 remove_mask |= site_data_mask;
112 } 112 }
113 if (prefs->GetBoolean(prefs::kDeletePasswords)) 113 if (prefs->GetBoolean(prefs::kDeletePasswords))
114 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; 114 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
115 if (prefs->GetBoolean(prefs::kDeleteFormData)) 115 if (prefs->GetBoolean(prefs::kDeleteFormData))
116 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; 116 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
117 117
118 int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod); 118 int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
119 119
120 base::FundamentalValue state(true); 120 base::FundamentalValue state(true);
(...skipping 13 matching lines...) Expand all
134 remover_->Remove(remove_mask); 134 remover_->Remove(remove_mask);
135 } 135 }
136 136
137 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() { 137 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
138 // No need to remove ourselves as an observer as BrowsingDataRemover deletes 138 // No need to remove ourselves as an observer as BrowsingDataRemover deletes
139 // itself after we return. 139 // itself after we return.
140 remover_ = NULL; 140 remover_ = NULL;
141 DCHECK(web_ui_); 141 DCHECK(web_ui_);
142 web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing"); 142 web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing");
143 } 143 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_clear_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698