diff options
author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 13:23:38 +0000 |
---|---|---|
committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 13:23:38 +0000 |
commit | 7f6f44c9e44707612415d4c85cfe9924aeacd917 (patch) | |
tree | 167b6d29691a127ef3ab1ada5b6f9c774d99363d /chrome/browser/extensions | |
parent | 7af0889d30c9a27b916aa49d4bfea7ea92465072 (diff) | |
download | chromium_src-7f6f44c9e44707612415d4c85cfe9924aeacd917.zip chromium_src-7f6f44c9e44707612415d4c85cfe9924aeacd917.tar.gz chromium_src-7f6f44c9e44707612415d4c85cfe9924aeacd917.tar.bz2 |
Split UserMetrics into API vs. implementation. Move API to content/public.
TBR=davemoore@chromium.org
BUG=98716
Review URL: http://codereview.chromium.org/8919017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r-- | chrome/browser/extensions/crx_installer.cc | 3 | ||||
-rw-r--r-- | chrome/browser/extensions/extension_function.cc | 5 | ||||
-rw-r--r-- | chrome/browser/extensions/extension_metrics_module.cc | 5 | ||||
-rw-r--r-- | chrome/browser/extensions/extension_service.cc | 1 | ||||
-rw-r--r-- | chrome/browser/extensions/file_manager_util.cc | 5 | ||||
-rw-r--r-- | chrome/browser/extensions/installed_loader.cc | 5 |
6 files changed, 14 insertions, 10 deletions
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index c7a900b..add5be9 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -32,9 +32,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" -#include "content/browser/user_metrics.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/user_metrics.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -43,6 +43,7 @@ #include "ui/base/resource/resource_bundle.h" using content::BrowserThread; +using content::UserMetricsAction; namespace { diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index 2e2d702..1854de5 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -12,13 +12,14 @@ #include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "chrome/common/extensions/extension_messages.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/user_metrics.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/user_metrics.h" #include "content/public/common/result_codes.h" using content::BrowserThread; +using content::UserMetricsAction; // static void ExtensionFunctionDeleteTraits::Destruct(const ExtensionFunction* x) { @@ -135,7 +136,7 @@ void ExtensionFunction::HandleBadMessage(base::ProcessHandle process) { CHECK(false); } else { NOTREACHED(); - UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_EFD")); + content::RecordAction(UserMetricsAction("BadMessageTerminate_EFD")); if (process) base::KillProcess(process, content::RESULT_CODE_KILLED_BAD_MESSAGE, false); diff --git a/chrome/browser/extensions/extension_metrics_module.cc b/chrome/browser/extensions/extension_metrics_module.cc index cd80ef9..48e5d08 100644 --- a/chrome/browser/extensions/extension_metrics_module.cc +++ b/chrome/browser/extensions/extension_metrics_module.cc @@ -6,16 +6,17 @@ #include "base/metrics/histogram.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/user_metrics.h" +#include "content/public/browser/user_metrics.h" using base::Histogram; using base::LinearHistogram; +using content::UserMetricsAction; bool MetricsRecordUserActionFunction::RunImpl() { std::string name; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &name)); - UserMetrics::RecordComputedAction(name); + content::RecordComputedAction(name); return true; } diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 12ae1d2..40fb7c7 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -92,7 +92,6 @@ #include "chrome/common/url_constants.h" #include "content/browser/plugin_process_host.h" #include "content/browser/plugin_service.h" -#include "content/browser/user_metrics.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_agent_host_registry.h" #include "content/public/browser/devtools_manager.h" diff --git a/chrome/browser/extensions/file_manager_util.cc b/chrome/browser/extensions/file_manager_util.cc index b3d344e..ecfc798 100644 --- a/chrome/browser/extensions/file_manager_util.cc +++ b/chrome/browser/extensions/file_manager_util.cc @@ -20,8 +20,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" #include "content/browser/plugin_service.h" -#include "content/browser/user_metrics.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" @@ -34,6 +34,7 @@ #endif using content::BrowserThread; +using content::UserMetricsAction; #define FILEBROWSER_DOMAIN "hhaomjibdihmijegdhdafkllkbggdgoj" const char kFileBrowserDomain[] = FILEBROWSER_DOMAIN; @@ -279,7 +280,7 @@ void ViewFolder(const FilePath& dir) { std::string url = chrome::kChromeUIFileManagerURL; url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false); - UserMetrics::RecordAction(UserMetricsAction("ShowFileBrowserFullTab")); + content::RecordAction(UserMetricsAction("ShowFileBrowserFullTab")); browser->ShowSingletonTabRespectRef(GURL(url)); } diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index d74bff4..61c17d6 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -18,9 +18,10 @@ #include "chrome/common/extensions/manifest.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" -#include "content/browser/user_metrics.h" +#include "content/public/browser/user_metrics.h" using content::BrowserThread; +using content::UserMetricsAction; namespace errors = extension_manifest_errors; @@ -88,7 +89,7 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) { info.extension_id != extension->id()) { error = errors::kCannotChangeExtensionID; extension = NULL; - UserMetrics::RecordAction(UserMetricsAction("Extensions.IDChangedError")); + content::RecordAction(UserMetricsAction("Extensions.IDChangedError")); } if (!extension) { |