Adding "Clear hosted app data" checkbox to browsing data removal UI.

chrome/browser/ui/webui/options2/clear_browser_data_handler2.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler2.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string16.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data_helper.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace options2 {
 
-ClearBrowserDataHandler::ClearBrowserDataHandler() : remover_(NULL) {
+ClearBrowserDataHandler::ClearBrowserDataHandler()
+    : remover_(NULL),
+      remove_hosted_app_data_pending_(false) {
 }
 
 ClearBrowserDataHandler::~ClearBrowserDataHandler() {
   if (remover_)
     remover_->RemoveObserver(this);
 }
 
 void ClearBrowserDataHandler::InitializeHandler() {
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
                                       Profile::FromWebUI(web_ui())->GetPrefs(),
                                       NULL);
 }
 
 void ClearBrowserDataHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "clearBrowserDataLabel", IDS_CLEAR_BROWSING_DATA_LABEL },
     { "deleteBrowsingHistoryCheckbox", IDS_DEL_BROWSING_HISTORY_CHKBOX },
     { "deleteDownloadHistoryCheckbox", IDS_DEL_DOWNLOAD_HISTORY_CHKBOX },
     { "deleteCacheCheckbox", IDS_DEL_CACHE_CHKBOX },
     { "deleteCookiesCheckbox", IDS_DEL_COOKIES_CHKBOX },
     { "deleteCookiesFlashCheckbox", IDS_DEL_COOKIES_FLASH_CHKBOX },
     { "deletePasswordsCheckbox", IDS_DEL_PASSWORDS_CHKBOX },
     { "deleteFormDataCheckbox", IDS_DEL_FORM_DATA_CHKBOX },
+    { "deleteHostedAppsDataCheckbox", IDS_DEL_HOSTED_APPS_DATA_CHKBOX },
     { "deauthorizeContentLicensesCheckbox",
       IDS_DEAUTHORIZE_CONTENT_LICENSES_CHKBOX },
     { "clearBrowserDataCommit", IDS_CLEAR_BROWSING_DATA_COMMIT },
     { "flash_storage_url", IDS_FLASH_STORAGE_URL },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "clearBrowserDataOverlay",
                 IDS_CLEAR_BROWSING_DATA_TITLE);
 
@@ skipping 50 matching lines @@
       site_data_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
     remove_mask |= site_data_mask;
   }
   if (prefs->GetBoolean(prefs::kDeletePasswords))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (prefs->GetBoolean(prefs::kDeleteFormData))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses))
     remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;
 
+  remove_hosted_app_data_pending_ =
+      prefs->GetBoolean(prefs::kDeleteHostedAppsData);
+
   int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
 
   base::FundamentalValue state(true);
   web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.setClearingState",
                                    state);
 
   // If we are still observing a previous data remover, we need to stop
   // observing.
   if (remover_)
     remover_->RemoveObserver(this);
 
   // BrowsingDataRemover deletes itself when done.
   remover_ = new BrowsingDataRemover(profile,
       static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
       base::Time());
   remover_->AddObserver(this);
   remover_->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB);
 }
 
+void ClearBrowserDataHandler::HandleClearHostedAppData() {

[Evan Stade, 2012/06/04 22:03:40]

it's confusing to call this Handle... because that makes it sound like it's
handling a chrome.send message.

[Mike West, 2012/06/05 08:55:02]

Dropping "Handle" from this and the above "HandleClearBrowserData".

+  Profile* profile = Profile::FromWebUI(web_ui());
+  PrefService* prefs = profile->GetPrefs();
+
+  // If we are still observing a previous data remover, we need to stop
+  // observing.
+  if (remover_)

[Evan Stade, 2012/06/04 22:03:40]

I don't think that remover_ can be non-NULL here because it's always set to NULL
on L171

[Mike West, 2012/06/05 08:55:02]

I think you're right. That's the only callsite for ClearHostedAppData, so
there's no need for this check here.

+    remover_->RemoveObserver(this);
+
+  int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
+  // BrowsingDataRemover deletes itself when done.
+  remover_ = new BrowsingDataRemover(profile,

[markusheintz_, 2012/06/04 14:50:52]

nit: If I interpret the style guide correctly then the parameter "profile" must
be moved to a new line.

[Mike West, 2012/06/05 08:55:02]

Done.

+      static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
+      base::Time());
+  remover_->AddObserver(this);
+  remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA,
+                   BrowsingDataHelper::PROTECTED_WEB);
+}
+
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
-  web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing");
+
+  if (remove_hosted_app_data_pending_) {
+    remove_hosted_app_data_pending_ = false;
+    HandleClearHostedAppData();

[Evan Stade, 2012/06/04 22:03:40]

why do you defer this until after the first set of data is removed? Why not
remove it in parallel?

[Mike West, 2012/06/05 08:55:02]

An excellent question, and one I should have read before fixing the rest of the
comments.

I'm not entirely sure that the BDR won't explode if we run two at once. But
trying it seems like a good way to find out.

[Mike West, 2012/06/05 08:55:02]

It explodes. BRD is actually set up to explicitly block concurrent removals: one
BRD runs at a time, period.

+  } else {
+    web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing");
+  }
 }
 
 }  // namespace options2