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

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: Media licenses everywhere 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
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 d40ee0f3c8f059c4ea39e73f49d8150c1b3f566a..80b67e7900b57b234507a860fa154d2d59ba45fd 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"
@@ -158,6 +160,15 @@ base::string16 GetCounterTextFromResult(
default:
NOTREACHED();
}
+ } else if (pref_name == prefs::kDeleteMediaLicenses) {
+ const MediaLicenseCounter::MediaLicenseResult* media_license_result =
+ static_cast<const MediaLicenseCounter::MediaLicenseResult*>(result);
+ text =
+ (media_license_result->Value() > 0)
Nico 2016/06/23 21:23:11 if your ternary op spans 6 lines, you probably wan
jrummell 2016/06/24 18:26:05 Done.
+ ? l10n_util::GetStringFUTF16(
+ IDS_DEL_MEDIA_LICENSES_SITE_COMMENT,
+ base::UTF8ToUTF16(media_license_result->GetOneOrigin()))
+ : l10n_util::GetStringUTF16(IDS_DEL_MEDIA_LICENSES_GENERAL_COMMENT);
}
return text;

Powered by Google App Engine
This is Rietveld 408576698