Adds "Delete Local Storage" option to "Clear Browsing Data" for Windows and G...

chrome/browser/cocoa/clear_browsing_data_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
 
 #include "base/mac_util.h"
 #include "base/scoped_nsobject.h"
 #include "base/singleton.h"
 #include "chrome/browser/browsing_data_remover.h"
@@ skipping 20 matching lines @@
 
 typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap;
 
 } // namespace
 
 @implementation ClearBrowsingDataController
 
 @synthesize clearBrowsingHistory = clearBrowsingHistory_;
 @synthesize clearDownloadHistory = clearDownloadHistory_;
 @synthesize emptyCache = emptyCache_;
+@synthesize deleteLocalStorage = deleteLocalStorage_;
 @synthesize deleteCookies = deleteCookies_;
 @synthesize clearSavedPasswords = clearSavedPasswords_;
 @synthesize clearFormData = clearFormData_;
 @synthesize timePeriod = timePeriod_;
 @synthesize isClearing = isClearing_;
 
 + (void)showClearBrowsingDialogForProfile:(Profile*)profile {
   ClearBrowsingDataController* controller =
       [ClearBrowsingDataController controllerForProfile:profile];
   if (![controller isWindowLoaded]) {
@@ skipping 54 matching lines @@
 }
 
 - (int)removeMask {
   int removeMask = 0L;
   if (clearBrowsingHistory_)
     removeMask |= BrowsingDataRemover::REMOVE_HISTORY;
   if (clearDownloadHistory_)
     removeMask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (emptyCache_)
     removeMask |= BrowsingDataRemover::REMOVE_CACHE;
+  if (deleteLocalStorage_)
+    removeMask |= BrowsingDataRemover::REMOVE_LOCAL_STORAGE;
   if (deleteCookies_)
      removeMask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (clearSavedPasswords_)
      removeMask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (clearFormData_)
     removeMask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   return removeMask;
 }
 
 // Called when the user clicks the "clear" button. Do the work and persist
@@ skipping 32 matching lines @@
 }
 
 // Initialize the bools from prefs using the setters to be KVO-compliant.
 - (void)initFromPrefs {
   PrefService* prefs = profile_->GetPrefs();
   [self setClearBrowsingHistory:
       prefs->GetBoolean(prefs::kDeleteBrowsingHistory)];
   [self setClearDownloadHistory:
       prefs->GetBoolean(prefs::kDeleteDownloadHistory)];
   [self setEmptyCache:prefs->GetBoolean(prefs::kDeleteCache)];
+  [self setDeleteLocalStorage:prefs->GetBoolean(prefs::kDeleteLocalStorage)];
   [self setDeleteCookies:prefs->GetBoolean(prefs::kDeleteCookies)];
   [self setClearSavedPasswords:prefs->GetBoolean(prefs::kDeletePasswords)];
   [self setClearFormData:prefs->GetBoolean(prefs::kDeleteFormData)];
   [self setTimePeriod:prefs->GetInteger(prefs::kDeleteTimePeriod)];
 }
 
 // Save the checkbox values to the preferences.
 - (void)persistToPrefs {
   PrefService* prefs = profile_->GetPrefs();
   prefs->SetBoolean(prefs::kDeleteBrowsingHistory,
                     [self clearBrowsingHistory]);
   prefs->SetBoolean(prefs::kDeleteDownloadHistory,
                     [self clearDownloadHistory]);
   prefs->SetBoolean(prefs::kDeleteCache, [self emptyCache]);
+  prefs->SetBoolean(prefs::kDeleteLocalStorage, [self deleteLocalStorage]);
   prefs->SetBoolean(prefs::kDeleteCookies, [self deleteCookies]);
   prefs->SetBoolean(prefs::kDeletePasswords, [self clearSavedPasswords]);
   prefs->SetBoolean(prefs::kDeleteFormData, [self clearFormData]);
   prefs->SetInteger(prefs::kDeleteTimePeriod, [self timePeriod]);
 }
 
 // Called when the data remover object is done with its work. Close the window.
 // The remover will delete itself. End the modal session at this point.
 - (void)dataRemoverDidFinish {
   [self closeDialog];
   [[self window] orderOut:self];
   [self setIsClearing:NO];
   remover_ = NULL;
 }
 
 @end