Create new histograms (with "2" suffix) corresponding to histograms using the "ExtensionPermission" enum.
Also, update the histograms owners and mark the old histograms as obsolete.
BUG=338008
Review URL: https://codereview.chromium.org/274943003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274728 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
index e3acae2..ba6af7c 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -509,7 +509,7 @@
// for all extension installs, so we only need to record the web store
// specific histogram here.
ExtensionService::RecordPermissionMessagesHistogram(
- dummy_extension_.get(), "Extensions.Permissions_WebStoreInstall");
+ dummy_extension_.get(), "Extensions.Permissions_WebStoreInstall2");
// Matches the AddRef in RunAsync().
Release();
@@ -525,15 +525,14 @@
// The web store install histograms are a subset of the install histograms.
// We need to record both histograms here since CrxInstaller::InstallUIAbort
// is never called for web store install cancellations.
- std::string histogram_name = user_initiated ?
- "Extensions.Permissions_WebStoreInstallCancel" :
- "Extensions.Permissions_WebStoreInstallAbort";
+ std::string histogram_name =
+ user_initiated ? "Extensions.Permissions_WebStoreInstallCancel2"
+ : "Extensions.Permissions_WebStoreInstallAbort2";
ExtensionService::RecordPermissionMessagesHistogram(dummy_extension_.get(),
histogram_name.c_str());
- histogram_name = user_initiated ?
- "Extensions.Permissions_InstallCancel" :
- "Extensions.Permissions_InstallAbort";
+ histogram_name = user_initiated ? "Extensions.Permissions_InstallCancel2"
+ : "Extensions.Permissions_InstallAbort2";
ExtensionService::RecordPermissionMessagesHistogram(dummy_extension_.get(),
histogram_name.c_str());
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index b77769ff4..32e27aa 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -659,9 +659,9 @@
// and if it is false, this function is called in response to
// ExtensionInstallPrompt::ConfirmInstall().
if (!update_from_settings_page_) {
- std::string histogram_name = user_initiated ?
- "Extensions.Permissions_InstallCancel" :
- "Extensions.Permissions_InstallAbort";
+ std::string histogram_name = user_initiated
+ ? "Extensions.Permissions_InstallCancel2"
+ : "Extensions.Permissions_InstallAbort2";
ExtensionService::RecordPermissionMessagesHistogram(
extension(), histogram_name.c_str());
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index fc55054..68620d5 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -127,9 +127,9 @@
}
void ExtensionDisabledDialogDelegate::InstallUIAbort(bool user_initiated) {
- std::string histogram_name = user_initiated ?
- "Extensions.Permissions_ReEnableCancel" :
- "Extensions.Permissions_ReEnableAbort";
+ std::string histogram_name = user_initiated
+ ? "Extensions.Permissions_ReEnableCancel2"
+ : "Extensions.Permissions_ReEnableAbort2";
ExtensionService::RecordPermissionMessagesHistogram(
extension_, histogram_name.c_str());
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 57818511..41acccf 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -742,7 +742,7 @@
UMA_HISTOGRAM_ENUMERATION("Extensions.UninstallType",
extension->GetType(), 100);
RecordPermissionMessagesHistogram(extension.get(),
- "Extensions.Permissions_Uninstall");
+ "Extensions.Permissions_Uninstall2");
// Unload before doing more cleanup to ensure that nothing is hanging on to
// any of these resources.
@@ -956,8 +956,8 @@
void ExtensionService::GrantPermissionsAndEnableExtension(
const Extension* extension) {
GrantPermissions(extension);
- RecordPermissionMessagesHistogram(
- extension, "Extensions.Permissions_ReEnable");
+ RecordPermissionMessagesHistogram(extension,
+ "Extensions.Permissions_ReEnable2");
extension_prefs_->SetDidExtensionEscalatePermissions(extension, false);
EnableExtension(extension->id());
}
@@ -1709,8 +1709,8 @@
} else if (is_privilege_increase) {
disable_reasons |= Extension::DISABLE_PERMISSIONS_INCREASE;
if (!extension_prefs_->DidExtensionEscalatePermissions(extension->id())) {
- RecordPermissionMessagesHistogram(
- extension, "Extensions.Permissions_AutoDisable");
+ RecordPermissionMessagesHistogram(extension,
+ "Extensions.Permissions_AutoDisable2");
}
extension_prefs_->SetExtensionState(extension->id(), Extension::DISABLED);
extension_prefs_->SetDidExtensionEscalatePermissions(extension, true);
@@ -1815,8 +1815,8 @@
extension->GetType(), 100);
UMA_HISTOGRAM_ENUMERATION("Extensions.InstallSource",
extension->location(), Manifest::NUM_LOCATIONS);
- RecordPermissionMessagesHistogram(
- extension, "Extensions.Permissions_Install");
+ RecordPermissionMessagesHistogram(extension,
+ "Extensions.Permissions_Install2");
} else {
UMA_HISTOGRAM_ENUMERATION("Extensions.UpdateType",
extension->GetType(), 100);
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index c8887ad..2470a321 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -442,7 +442,7 @@
RecordCreationFlags(extension);
ExtensionService::RecordPermissionMessagesHistogram(
- extension, "Extensions.Permissions_Load");
+ extension, "Extensions.Permissions_Load2");
// For incognito and file access, skip anything that doesn't appear in
// settings. Also, policy-installed (and unpacked of course, checked above)
diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/extensions/navigation_observer.cc
index 7fa60a6..ac19ff6 100644
--- a/chrome/browser/extensions/navigation_observer.cc
+++ b/chrome/browser/extensions/navigation_observer.cc
@@ -112,9 +112,9 @@
in_progress_prompt_navigation_controller_ = NULL;
extension_install_prompt_.reset();
- std::string histogram_name = user_initiated ?
- "Extensions.Permissions_ReEnableCancel" :
- "Extensions.Permissions_ReEnableAbort";
+ std::string histogram_name = user_initiated
+ ? "Extensions.Permissions_ReEnableCancel2"
+ : "Extensions.Permissions_ReEnableAbort2";
ExtensionService::RecordPermissionMessagesHistogram(
extension, histogram_name.c_str());
}
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 8dac8c27..663da82c 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -824,9 +824,9 @@
// called when the extension uninstall dialog is canceled.
const Extension* extension =
extension_service_->GetExtensionById(extension_id_prompting_, true);
- std::string histogram_name = user_initiated ?
- "Extensions.Permissions_ReEnableCancel" :
- "Extensions.Permissions_ReEnableAbort";
+ std::string histogram_name = user_initiated
+ ? "Extensions.Permissions_ReEnableCancel2"
+ : "Extensions.Permissions_ReEnableAbort2";
ExtensionService::RecordPermissionMessagesHistogram(
extension, histogram_name.c_str());
