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

Side by Side Diff: chrome/browser/views/clear_browsing_data.cc

Issue 524026: Adds "Delete Local Storage" option to "Clear Browsing Data" for Windows and G... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/views/clear_browsing_data.h ('k') | chrome/common/pref_names.h » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/clear_browsing_data.h" 5 #include "chrome/browser/views/clear_browsing_data.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "chrome/browser/profile.h" 8 #include "chrome/browser/profile.h"
9 #include "chrome/browser/search_engines/template_url_model.h" 9 #include "chrome/browser/search_engines/template_url_model.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 26 matching lines...) Expand all
37 37
38 } // namespace browser 38 } // namespace browser
39 39
40 //////////////////////////////////////////////////////////////////////////////// 40 ////////////////////////////////////////////////////////////////////////////////
41 // ClearBrowsingDataView, public: 41 // ClearBrowsingDataView, public:
42 42
43 ClearBrowsingDataView::ClearBrowsingDataView(Profile* profile) 43 ClearBrowsingDataView::ClearBrowsingDataView(Profile* profile)
44 : del_history_checkbox_(NULL), 44 : del_history_checkbox_(NULL),
45 del_downloads_checkbox_(NULL), 45 del_downloads_checkbox_(NULL),
46 del_cache_checkbox_(NULL), 46 del_cache_checkbox_(NULL),
47 del_local_storage_checkbox_(NULL),
47 del_cookies_checkbox_(NULL), 48 del_cookies_checkbox_(NULL),
48 del_passwords_checkbox_(NULL), 49 del_passwords_checkbox_(NULL),
49 del_form_data_checkbox_(NULL), 50 del_form_data_checkbox_(NULL),
50 time_period_label_(NULL), 51 time_period_label_(NULL),
51 time_period_combobox_(NULL), 52 time_period_combobox_(NULL),
52 delete_in_progress_(false), 53 delete_in_progress_(false),
53 profile_(profile), 54 profile_(profile),
54 remover_(NULL) { 55 remover_(NULL) {
55 DCHECK(profile); 56 DCHECK(profile);
56 Init(); 57 Init();
(...skipping 30 matching lines...) Expand all
87 profile_->GetPrefs()->GetBoolean(prefs::kDeleteBrowsingHistory)); 88 profile_->GetPrefs()->GetBoolean(prefs::kDeleteBrowsingHistory));
88 89
89 del_downloads_checkbox_ = 90 del_downloads_checkbox_ =
90 AddCheckbox(l10n_util::GetString(IDS_DEL_DOWNLOAD_HISTORY_CHKBOX), 91 AddCheckbox(l10n_util::GetString(IDS_DEL_DOWNLOAD_HISTORY_CHKBOX),
91 profile_->GetPrefs()->GetBoolean(prefs::kDeleteDownloadHistory)); 92 profile_->GetPrefs()->GetBoolean(prefs::kDeleteDownloadHistory));
92 93
93 del_cache_checkbox_ = 94 del_cache_checkbox_ =
94 AddCheckbox(l10n_util::GetString(IDS_DEL_CACHE_CHKBOX), 95 AddCheckbox(l10n_util::GetString(IDS_DEL_CACHE_CHKBOX),
95 profile_->GetPrefs()->GetBoolean(prefs::kDeleteCache)); 96 profile_->GetPrefs()->GetBoolean(prefs::kDeleteCache));
96 97
98 del_local_storage_checkbox_ =
99 AddCheckbox(l10n_util::GetString(IDS_DEL_LOCAL_STORAGE_CHKBOX),
100 profile_->GetPrefs()->GetBoolean(prefs::kDeleteLocalStorage));
101
97 del_cookies_checkbox_ = 102 del_cookies_checkbox_ =
98 AddCheckbox(l10n_util::GetString(IDS_DEL_COOKIES_CHKBOX), 103 AddCheckbox(l10n_util::GetString(IDS_DEL_COOKIES_CHKBOX),
99 profile_->GetPrefs()->GetBoolean(prefs::kDeleteCookies)); 104 profile_->GetPrefs()->GetBoolean(prefs::kDeleteCookies));
100 105
101 del_passwords_checkbox_ = 106 del_passwords_checkbox_ =
102 AddCheckbox(l10n_util::GetString(IDS_DEL_PASSWORDS_CHKBOX), 107 AddCheckbox(l10n_util::GetString(IDS_DEL_PASSWORDS_CHKBOX),
103 profile_->GetPrefs()->GetBoolean(prefs::kDeletePasswords)); 108 profile_->GetPrefs()->GetBoolean(prefs::kDeletePasswords));
104 109
105 del_form_data_checkbox_ = 110 del_form_data_checkbox_ =
106 AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX), 111 AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 kRelatedControlVerticalSpacing, 156 kRelatedControlVerticalSpacing,
152 sz.width(), sz.height()); 157 sz.width(), sz.height());
153 158
154 sz = del_cache_checkbox_->GetPreferredSize(); 159 sz = del_cache_checkbox_->GetPreferredSize();
155 del_cache_checkbox_->SetBounds(2 * kPanelHorizMargin, 160 del_cache_checkbox_->SetBounds(2 * kPanelHorizMargin,
156 del_downloads_checkbox_->y() + 161 del_downloads_checkbox_->y() +
157 del_downloads_checkbox_->height() + 162 del_downloads_checkbox_->height() +
158 kRelatedControlVerticalSpacing, 163 kRelatedControlVerticalSpacing,
159 sz.width(), sz.height()); 164 sz.width(), sz.height());
160 165
166 sz = del_local_storage_checkbox_->GetPreferredSize();
167 del_local_storage_checkbox_->SetBounds(2 * kPanelHorizMargin,
168 del_cache_checkbox_->y() +
169 del_cache_checkbox_->height() +
170 kRelatedControlVerticalSpacing,
171 sz.width(), sz.height());
172
161 sz = del_cookies_checkbox_->GetPreferredSize(); 173 sz = del_cookies_checkbox_->GetPreferredSize();
162 del_cookies_checkbox_->SetBounds(2 * kPanelHorizMargin, 174 del_cookies_checkbox_->SetBounds(2 * kPanelHorizMargin,
163 del_cache_checkbox_->y() + 175 del_local_storage_checkbox_->y() +
164 del_cache_checkbox_->height() + 176 del_local_storage_checkbox_->height() +
165 kRelatedControlVerticalSpacing, 177 kRelatedControlVerticalSpacing,
166 sz.width(), sz.height()); 178 sz.width(), sz.height());
167 179
168 sz = del_passwords_checkbox_->GetPreferredSize(); 180 sz = del_passwords_checkbox_->GetPreferredSize();
169 del_passwords_checkbox_->SetBounds(2 * kPanelHorizMargin, 181 del_passwords_checkbox_->SetBounds(2 * kPanelHorizMargin,
170 del_cookies_checkbox_->y() + 182 del_cookies_checkbox_->y() +
171 del_cookies_checkbox_->height() + 183 del_cookies_checkbox_->height() +
172 kRelatedControlVerticalSpacing, 184 kRelatedControlVerticalSpacing,
173 sz.width(), sz.height()); 185 sz.width(), sz.height());
174 186
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 273
262 bool ClearBrowsingDataView::IsDialogButtonEnabled( 274 bool ClearBrowsingDataView::IsDialogButtonEnabled(
263 MessageBoxFlags::DialogButton button) const { 275 MessageBoxFlags::DialogButton button) const {
264 if (delete_in_progress_) 276 if (delete_in_progress_)
265 return false; 277 return false;
266 278
267 if (button == MessageBoxFlags::DIALOGBUTTON_OK) { 279 if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
268 return del_history_checkbox_->checked() || 280 return del_history_checkbox_->checked() ||
269 del_downloads_checkbox_->checked() || 281 del_downloads_checkbox_->checked() ||
270 del_cache_checkbox_->checked() || 282 del_cache_checkbox_->checked() ||
283 del_local_storage_checkbox_->checked() ||
271 del_cookies_checkbox_->checked() || 284 del_cookies_checkbox_->checked() ||
272 del_passwords_checkbox_->checked() || 285 del_passwords_checkbox_->checked() ||
273 del_form_data_checkbox_->checked(); 286 del_form_data_checkbox_->checked();
274 } 287 }
275 288
276 return true; 289 return true;
277 } 290 }
278 291
279 bool ClearBrowsingDataView::CanResize() const { 292 bool ClearBrowsingDataView::CanResize() const {
280 return false; 293 return false;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 views::Button* sender, const views::Event& event) { 360 views::Button* sender, const views::Event& event) {
348 if (sender == del_history_checkbox_) 361 if (sender == del_history_checkbox_)
349 profile_->GetPrefs()->SetBoolean(prefs::kDeleteBrowsingHistory, 362 profile_->GetPrefs()->SetBoolean(prefs::kDeleteBrowsingHistory,
350 del_history_checkbox_->checked() ? true : false); 363 del_history_checkbox_->checked() ? true : false);
351 else if (sender == del_downloads_checkbox_) 364 else if (sender == del_downloads_checkbox_)
352 profile_->GetPrefs()->SetBoolean(prefs::kDeleteDownloadHistory, 365 profile_->GetPrefs()->SetBoolean(prefs::kDeleteDownloadHistory,
353 del_downloads_checkbox_->checked() ? true : false); 366 del_downloads_checkbox_->checked() ? true : false);
354 else if (sender == del_cache_checkbox_) 367 else if (sender == del_cache_checkbox_)
355 profile_->GetPrefs()->SetBoolean(prefs::kDeleteCache, 368 profile_->GetPrefs()->SetBoolean(prefs::kDeleteCache,
356 del_cache_checkbox_->checked() ? true : false); 369 del_cache_checkbox_->checked() ? true : false);
370 else if (sender == del_local_storage_checkbox_)
371 profile_->GetPrefs()->SetBoolean(prefs::kDeleteLocalStorage,
372 del_local_storage_checkbox_->checked() ? true : false);
357 else if (sender == del_cookies_checkbox_) 373 else if (sender == del_cookies_checkbox_)
358 profile_->GetPrefs()->SetBoolean(prefs::kDeleteCookies, 374 profile_->GetPrefs()->SetBoolean(prefs::kDeleteCookies,
359 del_cookies_checkbox_->checked() ? true : false); 375 del_cookies_checkbox_->checked() ? true : false);
360 else if (sender == del_passwords_checkbox_) 376 else if (sender == del_passwords_checkbox_)
361 profile_->GetPrefs()->SetBoolean(prefs::kDeletePasswords, 377 profile_->GetPrefs()->SetBoolean(prefs::kDeletePasswords,
362 del_passwords_checkbox_->checked() ? true : false); 378 del_passwords_checkbox_->checked() ? true : false);
363 else if (sender == del_form_data_checkbox_) 379 else if (sender == del_form_data_checkbox_)
364 profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData, 380 profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData,
365 del_form_data_checkbox_->checked() ? true : false); 381 del_form_data_checkbox_->checked() ? true : false);
366 382
(...skipping 13 matching lines...) Expand all
380 AddChildView(checkbox); 396 AddChildView(checkbox);
381 return checkbox; 397 return checkbox;
382 } 398 }
383 399
384 void ClearBrowsingDataView::UpdateControlEnabledState() { 400 void ClearBrowsingDataView::UpdateControlEnabledState() {
385 window()->EnableClose(!delete_in_progress_); 401 window()->EnableClose(!delete_in_progress_);
386 402
387 del_history_checkbox_->SetEnabled(!delete_in_progress_); 403 del_history_checkbox_->SetEnabled(!delete_in_progress_);
388 del_downloads_checkbox_->SetEnabled(!delete_in_progress_); 404 del_downloads_checkbox_->SetEnabled(!delete_in_progress_);
389 del_cache_checkbox_->SetEnabled(!delete_in_progress_); 405 del_cache_checkbox_->SetEnabled(!delete_in_progress_);
406 del_local_storage_checkbox_->SetEnabled(!delete_in_progress_);
390 del_cookies_checkbox_->SetEnabled(!delete_in_progress_); 407 del_cookies_checkbox_->SetEnabled(!delete_in_progress_);
391 del_passwords_checkbox_->SetEnabled(!delete_in_progress_); 408 del_passwords_checkbox_->SetEnabled(!delete_in_progress_);
392 del_form_data_checkbox_->SetEnabled(!delete_in_progress_); 409 del_form_data_checkbox_->SetEnabled(!delete_in_progress_);
393 time_period_combobox_->SetEnabled(!delete_in_progress_); 410 time_period_combobox_->SetEnabled(!delete_in_progress_);
394 411
395 status_label_.SetVisible(delete_in_progress_); 412 status_label_.SetVisible(delete_in_progress_);
396 throbber_->SetVisible(delete_in_progress_); 413 throbber_->SetVisible(delete_in_progress_);
397 if (delete_in_progress_) 414 if (delete_in_progress_)
398 throbber_->Start(); 415 throbber_->Start();
399 else 416 else
(...skipping 18 matching lines...) Expand all
418 if (IsCheckBoxEnabledAndSelected(del_downloads_checkbox_)) 435 if (IsCheckBoxEnabledAndSelected(del_downloads_checkbox_))
419 remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS; 436 remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
420 if (IsCheckBoxEnabledAndSelected(del_cookies_checkbox_)) 437 if (IsCheckBoxEnabledAndSelected(del_cookies_checkbox_))
421 remove_mask |= BrowsingDataRemover::REMOVE_COOKIES; 438 remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
422 if (IsCheckBoxEnabledAndSelected(del_passwords_checkbox_)) 439 if (IsCheckBoxEnabledAndSelected(del_passwords_checkbox_))
423 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; 440 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
424 if (IsCheckBoxEnabledAndSelected(del_form_data_checkbox_)) 441 if (IsCheckBoxEnabledAndSelected(del_form_data_checkbox_))
425 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; 442 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
426 if (IsCheckBoxEnabledAndSelected(del_cache_checkbox_)) 443 if (IsCheckBoxEnabledAndSelected(del_cache_checkbox_))
427 remove_mask |= BrowsingDataRemover::REMOVE_CACHE; 444 remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
445 if (IsCheckBoxEnabledAndSelected(del_local_storage_checkbox_))
446 remove_mask |= BrowsingDataRemover::REMOVE_LOCAL_STORAGE;
428 447
429 delete_in_progress_ = true; 448 delete_in_progress_ = true;
430 UpdateControlEnabledState(); 449 UpdateControlEnabledState();
431 450
432 // BrowsingDataRemover deletes itself when done. 451 // BrowsingDataRemover deletes itself when done.
433 remover_ = new BrowsingDataRemover(profile_, 452 remover_ = new BrowsingDataRemover(profile_,
434 static_cast<BrowsingDataRemover::TimePeriod>(period_selected), 453 static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
435 base::Time()); 454 base::Time());
436 remover_->AddObserver(this); 455 remover_->AddObserver(this);
437 remover_->Remove(remove_mask); 456 remover_->Remove(remove_mask);
438 } 457 }
439 458
440 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() { 459 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() {
441 // No need to remove ourselves as an observer as BrowsingDataRemover deletes 460 // No need to remove ourselves as an observer as BrowsingDataRemover deletes
442 // itself after we return. 461 // itself after we return.
443 remover_ = NULL; 462 remover_ = NULL;
444 window()->Close(); 463 window()->Close();
445 } 464 }
OLDNEW
« no previous file with comments | « chrome/browser/views/clear_browsing_data.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698