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

Unified Diff: chrome/browser/browsing_data/browsing_data_counter_utils.cc

Issue 2075023002: UI Changes to support clearing EME/CDM data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert options_page.css Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/browsing_data/browsing_data_remover.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data/browsing_data_counter_utils.cc
diff --git a/chrome/browser/browsing_data/browsing_data_counter_utils.cc b/chrome/browser/browsing_data/browsing_data_counter_utils.cc
index 297245c74c81a11acacf1a41a8dfbb05bc022c01..ea51feb99fef61fa4ed8e64e7bcd93e128aad7cf 100644
--- a/chrome/browser/browsing_data/browsing_data_counter_utils.cc
+++ b/chrome/browser/browsing_data/browsing_data_counter_utils.cc
@@ -5,9 +5,11 @@
#include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
#include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browsing_data/autofill_counter.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/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@@ -170,6 +172,18 @@ base::string16 GetCounterTextFromResult(
NOTREACHED();
}
+ } else if (pref_name == prefs::kDeleteMediaLicenses) {
+ const MediaLicensesCounter::MediaLicenseResult* media_license_result =
+ static_cast<const MediaLicensesCounter::MediaLicenseResult*>(result);
+ if (media_license_result->Value() > 0) {
+ text = l10n_util::GetStringFUTF16(
+ IDS_DEL_MEDIA_LICENSES_COUNTER_SITE_COMMENT,
+ base::UTF8ToUTF16(media_license_result->GetOneOrigin()));
+ } else {
+ text = l10n_util::GetStringUTF16(
+ IDS_DEL_MEDIA_LICENSES_COUNTER_GENERAL_COMMENT);
+ }
+
#if defined(ENABLE_EXTENSIONS)
} else if (pref_name == prefs::kDeleteHostedAppsData) {
// Hosted apps counter.
@@ -205,7 +219,6 @@ base::string16 GetCounterTextFromResult(
replacements,
nullptr);
#endif
-
}
return text;
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/browsing_data/browsing_data_remover.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698