Restart the browsing data counters when the CBD dialog is opened.

chrome/browser/ui/webui/options/clear_browser_data_handler.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/options/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 79 matching lines @@
   web_ui()->CallJavascriptFunction(
       "ClearBrowserDataOverlay.createFooter",
       base::FundamentalValue(AreCountersEnabled()),
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()));
   UpdateInfoBannerVisibility();
   OnBrowsingHistoryPrefChanged();
   bool removal_in_progress = !!remover_;
   web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.setClearing",
                                    base::FundamentalValue(removal_in_progress));
 
-  for (BrowsingDataCounter* counter : counters_) {
-    DCHECK(AreCountersEnabled());
-    counter->Restart();
-  }
   web_ui()->CallJavascriptFunction(
       "ClearBrowserDataOverlay.markInitializationComplete");
 }
 
 void ClearBrowserDataHandler::UpdateInfoBannerVisibility() {
   base::string16 text;
 
   Profile* profile = Profile::FromWebUI(web_ui());
   auto availability = IncognitoModePrefs::GetAvailability(profile->GetPrefs());
   if (availability == IncognitoModePrefs::ENABLED) {
     base::Time last_clear_time = base::Time::FromInternalValue(
         profile->GetPrefs()->GetInt64(prefs::kLastClearBrowsingDataTime));
 
     const base::TimeDelta since_clear = base::Time::Now() - last_clear_time;
     if (since_clear < base::TimeDelta::FromHours(base::Time::kHoursPerDay)) {
       ui::Accelerator acc = chrome::GetPrimaryChromeAcceleratorForCommandId(
           IDC_NEW_INCOGNITO_WINDOW);
       DCHECK_NE(ui::VKEY_UNKNOWN, acc.key_code());
       text = l10n_util::GetStringFUTF16(IDS_CLEAR_BROWSING_DATA_INFO_BAR_TEXT,
                                         acc.GetShortcutText());
     }
   }
 
   web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.setBannerText",
                                    base::StringValue(text));
 }
 
+void ClearBrowserDataHandler::OnPageOpened(const base::ListValue* value) {
+  for (BrowsingDataCounter* counter : counters_) {
+    DCHECK(AreCountersEnabled());
+    counter->Restart();
+  }
+}
+
 void ClearBrowserDataHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "clearBrowserDataLabel", IDS_CLEAR_BROWSING_DATA_LABEL },
     { "clearBrowserDataSyncWarning", IDS_CLEAR_BROWSING_DATA_SYNCED_DELETION },
     { "clearBrowserDataSupportString", AreCountersEnabled()
         ? IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS_SIMPLE
         : IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS },
@@ skipping 45 matching lines @@
   localized_strings->Set("clearBrowserDataTimeList", time_list);
   localized_strings->SetBoolean("showDeleteBrowsingHistoryCheckboxes",
                                 !Profile::FromWebUI(web_ui())->IsSupervised());
 }
 
 void ClearBrowserDataHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
   web_ui()->RegisterMessageCallback("performClearBrowserData",
       base::Bind(&ClearBrowserDataHandler::HandleClearBrowserData,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("openedClearBrowserData",
+      base::Bind(&ClearBrowserDataHandler::OnPageOpened,
+                 base::Unretained(this)));
 }
 
 void ClearBrowserDataHandler::HandleClearBrowserData(
     const base::ListValue* value) {
   // We should never be called when the previous clearing has not yet finished.
   CHECK(!remover_);
 
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
 
@@ skipping 122 matching lines @@
       base::StringValue(text));
 }
 
 void ClearBrowserDataHandler::OnStateChanged() {
   web_ui()->CallJavascriptFunction(
       "ClearBrowserDataOverlay.updateSyncWarning",
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()));
 }
 
 }  // namespace options