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/first_run | |
| 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/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index b03e322..fb93929 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -31,7 +31,7 @@ #include "chrome/installer/util/master_preferences.h" #include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/util_constants.h" -#include "content/browser/user_metrics.h" +#include "content/public/browser/user_metrics.h" #include "googleurl/src/gurl.h" #if defined(OS_WIN) @@ -40,6 +40,8 @@ #include "chrome/installer/util/install_util.h" #endif +using content::UserMetricsAction; + namespace { // The kSentinelFile file absence will tell us it is a first run. @@ -618,7 +620,7 @@ void FirstRun::AutoImport( ImportSettings(profile, importer_host, importer_list, items); } - UserMetrics::RecordAction(UserMetricsAction("FirstRunDef_Accept")); + content::RecordAction(UserMetricsAction("FirstRunDef_Accept")); // Launch the search engine dialog only for certain builds, and only if the // user has not already set preferences. diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index b7e6401..e0b41e4 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -36,8 +36,8 @@ #include "chrome/installer/util/master_preferences.h" #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" -#include "content/browser/user_metrics.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/user_metrics.h" #include "google_update_idl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -46,6 +46,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" +using content::UserMetricsAction; + namespace { // Helper class that performs delayed first-run tasks that need more of the |