diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 19:40:08 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 19:40:08 +0000 |
commit | 7fa19f8c525235f3318359b4e6f647e1dfd18f46 (patch) | |
tree | 83b8148a77823c65c8f74aba0a079bc4b1e94bd1 /chrome/browser/extensions/extension_updater.cc | |
parent | 0ff0ff32b0b9f301200cb4e595fef541118a2987 (diff) | |
download | chromium_src-7fa19f8c525235f3318359b4e6f647e1dfd18f46.zip chromium_src-7fa19f8c525235f3318359b4e6f647e1dfd18f46.tar.gz chromium_src-7fa19f8c525235f3318359b4e6f647e1dfd18f46.tar.bz2 |
Coalesced various extension type enums into Extension::Type.
Renamed Extension::HistogramType to Extension::Type and used it
everywhere.
Moved extension sync security checks into sync land and simplified them.
BUG=55823
TEST=Existing unit tests / sync integration tests
Review URL: http://codereview.chromium.org/5946001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_updater.cc')
-rw-r--r-- | chrome/browser/extensions/extension_updater.cc | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index d143052..63374ac 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -190,8 +190,7 @@ void ManifestFetchesBuilder::AddExtension(const Extension& extension) { AddExtensionData(extension.location(), extension.id(), *extension.version(), - (extension.is_theme() ? PendingExtensionInfo::THEME - : PendingExtensionInfo::EXTENSION), + extension.GetType(), extension.update_url(), update_url_data); } @@ -204,17 +203,20 @@ void ManifestFetchesBuilder::AddPendingExtension( scoped_ptr<Version> version( Version::GetVersionFromString("0.0.0.0")); - AddExtensionData(info.install_source, id, *version, - info.expected_crx_type, info.update_url, ""); + AddExtensionData( + info.install_source, id, *version, + Extension::TYPE_UNKNOWN, info.update_url, ""); } void ManifestFetchesBuilder::ReportStats() const { - UMA_HISTOGRAM_COUNTS_100("Extensions.UpdateCheckExtensions", - url_stats_.google_url_count + - url_stats_.other_url_count - - url_stats_.theme_count); + UMA_HISTOGRAM_COUNTS_100("Extensions.UpdateCheckExtension", + url_stats_.extension_count); UMA_HISTOGRAM_COUNTS_100("Extensions.UpdateCheckTheme", url_stats_.theme_count); + UMA_HISTOGRAM_COUNTS_100("Extensions.UpdateCheckApp", + url_stats_.app_count); + UMA_HISTOGRAM_COUNTS_100("Extensions.UpdateCheckPending", + url_stats_.pending_count); UMA_HISTOGRAM_COUNTS_100("Extensions.UpdateCheckGoogleUrl", url_stats_.google_url_count); UMA_HISTOGRAM_COUNTS_100("Extensions.UpdateCheckOtherUrl", @@ -239,7 +241,7 @@ void ManifestFetchesBuilder::AddExtensionData( Extension::Location location, const std::string& id, const Version& version, - PendingExtensionInfo::ExpectedCrxType crx_type, + Extension::Type extension_type, GURL update_url, const std::string& update_url_data) { @@ -272,8 +274,21 @@ void ManifestFetchesBuilder::AddExtensionData( url_stats_.other_url_count++; } - if (crx_type == PendingExtensionInfo::THEME) { - url_stats_.theme_count++; + switch (extension_type) { + case Extension::TYPE_THEME: + ++url_stats_.theme_count; + break; + case Extension::TYPE_EXTENSION: + case Extension::TYPE_USER_SCRIPT: + ++url_stats_.extension_count; + break; + case Extension::TYPE_HOSTED_APP: + case Extension::TYPE_PACKAGED_APP: + ++url_stats_.app_count; + case Extension::TYPE_UNKNOWN: + default: + ++url_stats_.pending_count; + break; } DCHECK(!update_url.is_empty()); |