diff options
| -rw-r--r-- | chrome/browser/browsing_data_helper.h | 2 | ||||
| -rw-r--r-- | chrome/browser/browsing_data_remover.cc | 20 | ||||
| -rw-r--r-- | chrome/tools/chromeactions.txt | 3 |
3 files changed, 25 insertions, 0 deletions
diff --git a/chrome/browser/browsing_data_helper.h b/chrome/browser/browsing_data_helper.h index ae05f1c..807ac6c 100644 --- a/chrome/browser/browsing_data_helper.h +++ b/chrome/browser/browsing_data_helper.h @@ -25,6 +25,8 @@ class BrowsingDataHelper { UNPROTECTED_WEB = 1 << 0, // drive-by web. PROTECTED_WEB = 1 << 1, // hosted applications. EXTENSION = 1 << 2, // chrome-extension://* + // Always add new items to the enum above ALL and add them to ALL. + ALL = UNPROTECTED_WEB | PROTECTED_WEB | EXTENSION, }; // Returns true iff the provided scheme is (really) web safe, and suitable diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 81d4b93..1edb5ed 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -189,6 +189,26 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask, remove_origin_ = origin; origin_set_mask_ = origin_set_mask; + if (origin_set_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) { + content::RecordAction( + UserMetricsAction("ClearBrowsingData_MaskContainsUnprotectedWeb")); + } + if (origin_set_mask_ & BrowsingDataHelper::PROTECTED_WEB) { + content::RecordAction( + UserMetricsAction("ClearBrowsingData_MaskContainsProtectedWeb")); + } + if (origin_set_mask_ & BrowsingDataHelper::EXTENSION) { + content::RecordAction( + UserMetricsAction("ClearBrowsingData_MaskContainsExtension")); + } + // If this fires, we added a new BrowsingDataHelper::OriginSetMask without + // updating the user metrics above. + COMPILE_ASSERT( + BrowsingDataHelper::ALL == (BrowsingDataHelper::UNPROTECTED_WEB | + BrowsingDataHelper::PROTECTED_WEB | + BrowsingDataHelper::EXTENSION), + forgotten_to_add_origin_mask_type); + if (remove_mask & REMOVE_HISTORY) { HistoryService* history_service = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt index 2908df8..40966b5 100644 --- a/chrome/tools/chromeactions.txt +++ b/chrome/tools/chromeactions.txt @@ -191,6 +191,9 @@ 0xea9b835bf0310f85 ClearBrowsingData_Downloads 0xe3c9686626019346 ClearBrowsingData_History 0x86678d0ede469c46 ClearBrowsingData_LSOData +0xe4d7f2be93ee4d1e ClearBrowsingData_MaskContainsExtension +0xadd630995b43ce2f ClearBrowsingData_MaskContainsProtectedWeb +0x1f885e1523585d6f ClearBrowsingData_MaskContainsUnprotectedWeb 0x511e8366cdda3890 ClearBrowsingData_Passwords 0x3db76495a0acc98c ClearBrowsingData_ServerBoundCerts 0x6d69a061f7adf595 ClearBrowsingData_ShowDlg |