UI Changes to support clearing EME/CDM data

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 <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 11 matching lines @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/autofill_counter.h"
 #include "chrome/browser/browsing_data/browsing_data_counter.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/history_counter.h"
+#include "chrome/browser/browsing_data/media_licenses_counter.h"
 #include "chrome/browser/browsing_data/passwords_counter.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
@@ skipping 34 matching lines @@
 ClearBrowserDataHandler::~ClearBrowserDataHandler() {
   if (remover_)
     remover_->RemoveObserver(this);
   if (sync_service_)
     sync_service_->RemoveObserver(this);
 }
 
 void ClearBrowserDataHandler::InitializeHandler() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled, prefs);
-  pepper_flash_settings_enabled_.Init(prefs::kPepperFlashSettingsEnabled,
-                                      prefs);
   allow_deleting_browser_history_.Init(
       prefs::kAllowDeletingBrowserHistory,
       prefs,
       base::Bind(&ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged,
                  base::Unretained(this)));
 
   if (AreCountersEnabled()) {
     AddCounter(base::WrapUnique(new PasswordsCounter()));
     AddCounter(base::WrapUnique(new HistoryCounter()));
     AddCounter(base::WrapUnique(new CacheCounter()));
     AddCounter(base::WrapUnique(new AutofillCounter()));
+    AddCounter(base::WrapUnique(new MediaLicenseCounter()));
 
     sync_service_ =
         ProfileSyncServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
     if (sync_service_)
       sync_service_->AddObserver(this);
   }
 }
 
 void ClearBrowserDataHandler::InitializePage() {
   web_ui()->CallJavascriptFunctionUnsafe(
@@ skipping 41 matching lines @@
     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 },
-    { "clearBrowserDataHistoryNoticeTitle",
-        IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_TITLE },
-    { "clearBrowserDataHistoryNoticeOk",
-        IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_OK },
-    { "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 },
-    { "flashStorageUrl", IDS_FLASH_STORAGE_URL },
+      {"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},
+      {"clearBrowserDataHistoryNoticeTitle",
+       IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_TITLE},
+      {"clearBrowserDataHistoryNoticeOk",
+       IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_OK},
+      {"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},
+      {"deleteMediaLicensesCheckbox", IDS_DEAUTHORIZE_CONTENT_LICENSES_CHKBOX},

[xhwang, 2016/06/21 06:02:41]

IDS_DEAUTHORIZE_CONTENT_LICENSES_CHKBOX should be renamed and its description
should be updated:

https://cs.chromium.org/chromium/src/chrome/app/generated_resources.grd?rcl=0...

[jrummell, 2016/06/23 02:48:55]

I don't want to change the name, as it is part of the old UI and still shows
"Content licenses". Description updated, though.

[xhwang, 2016/06/23 04:30:54]

hmm, I am a bit confused. I thought we'll be updating both old and new UI to
"Media Licenses" (see the UI review doc). Also it might be better to be
consistent.

[jrummell, 2016/06/23 19:17:35]

You're right. The original doc didn't change the text for this dialog, but the
most recent includes both. Done.

+      {"clearBrowserDataCommit", IDS_CLEAR_BROWSING_DATA_COMMIT},
+      {"flashStorageUrl", IDS_FLASH_STORAGE_URL},
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "clearBrowserDataOverlay",
                 IDS_CLEAR_BROWSING_DATA_TITLE);
   localized_strings->SetString("clearBrowsingDataLearnMoreUrl",
                                kClearBrowsingDataLearnMoreUrl);
   localized_strings->SetString(
       "clearBrowserDataHistoryFooter",
       l10n_util::GetStringFUTF16(
@@ skipping 71 matching lines @@
   if (prefs->GetBoolean(prefs::kDeleteCache))
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
   if (prefs->GetBoolean(prefs::kDeleteCookies)) {
     remove_mask |= site_data_mask;
     origin_mask |= BrowsingDataHelper::UNPROTECTED_WEB;
   }
   if (prefs->GetBoolean(prefs::kDeletePasswords))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (prefs->GetBoolean(prefs::kDeleteFormData))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
-  // Clearing Content Licenses is only supported in Pepper Flash.
-  if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses) &&
-      *pepper_flash_settings_enabled_) {
-    remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;
-  }
+  if (prefs->GetBoolean(prefs::kDeleteMediaLicenses))
+    remove_mask |= BrowsingDataRemover::REMOVE_MEDIA_LICENSES;
   if (prefs->GetBoolean(prefs::kDeleteHostedAppsData)) {
     remove_mask |= site_data_mask;
     origin_mask |= BrowsingDataHelper::PROTECTED_WEB;
   }
 
   // Record the deletion of cookies and cache.
   BrowsingDataRemover::CookieOrCacheDeletionChoice choice =
       BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE;
   if (prefs->GetBoolean(prefs::kDeleteCookies)) {
     choice = prefs->GetBoolean(prefs::kDeleteCache)
         ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE
         : BrowsingDataRemover::ONLY_COOKIES;
   } else if (prefs->GetBoolean(prefs::kDeleteCache)) {
     choice = BrowsingDataRemover::ONLY_CACHE;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "History.ClearBrowsingData.UserDeletedCookieOrCacheFromDialog",
       choice, BrowsingDataRemover::MAX_CHOICE_VALUE);
 
   // Record the circumstances under which passwords are deleted.
   if (prefs->GetBoolean(prefs::kDeletePasswords)) {
     static const char* other_types[] = {
-        prefs::kDeleteBrowsingHistory,
-        prefs::kDeleteDownloadHistory,
-        prefs::kDeleteCache,
-        prefs::kDeleteCookies,
-        prefs::kDeleteFormData,
-        prefs::kDeleteHostedAppsData,
-        prefs::kDeauthorizeContentLicenses,
+        prefs::kDeleteBrowsingHistory, prefs::kDeleteDownloadHistory,
+        prefs::kDeleteCache,           prefs::kDeleteCookies,
+        prefs::kDeleteFormData,        prefs::kDeleteHostedAppsData,
+        prefs::kDeleteMediaLicenses,

[Peter Kasting, 2016/06/22 00:05:14]

Nit: Honestly, I think the one-per-line wrapping of the old code was more
readable in this case.

[jrummell, 2016/06/23 02:48:55]

Done (and ignored format trying to change it back).

     };
     static size_t num_other_types = arraysize(other_types);
     int checked_other_types = std::count_if(
         other_types,
         other_types + num_other_types,
         [prefs](const std::string& pref) { return prefs->GetBoolean(pref); });
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "History.ClearBrowsingData.PasswordsDeletion.AdditionalDatatypesCount",
         checked_other_types);
   }
@@ skipping 108 matching lines @@
       "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated",
       should_show_history_notice_);
 }
 
 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) {
   // This is used by OnBrowsingDataRemoverDone (when the deletion finishes).
   should_show_history_deletion_dialog_ = show;
 }
 
 }  // namespace options