summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-13 18:07:44 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-13 18:07:44 +0000
commit0b88fdb528f015cc6c602ec098878a5e0203657b (patch)
tree6e805b8cfe86c131318cf83dafa8f42c48895242 /chrome
parent8869a5f5c945fd2ce67aea4107c700dda12d150f (diff)
downloadchromium_src-0b88fdb528f015cc6c602ec098878a5e0203657b.zip
chromium_src-0b88fdb528f015cc6c602ec098878a5e0203657b.tar.gz
chromium_src-0b88fdb528f015cc6c602ec098878a5e0203657b.tar.bz2
Register Metrics prefs for Mac and Linux.
http://codereview.chromium.org/20350 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_prefs.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 0095dfe..6f60ace 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/browser.h"
#include "chrome/browser/cache_manager_host.h"
+#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/browser/renderer_host/browser_render_process_host.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
#include "chrome/browser/google_url_tracker.h"
@@ -18,7 +19,6 @@
#include "chrome/browser/net/dns_global.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/external_protocol_handler.h"
-#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/spellchecker.h"
@@ -41,13 +41,13 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
BrowserRenderProcessHost::RegisterPrefs(local_state);
CacheManagerHost::RegisterPrefs(local_state);
SafeBrowsingService::RegisterPrefs(local_state);
+ MetricsLog::RegisterPrefs(local_state);
+ MetricsService::RegisterPrefs(local_state);
#if defined(OS_WIN) // TODO(port): whittle this down as we port
BookmarkManagerView::RegisterPrefs(local_state);
BrowserView::RegisterBrowserViewPrefs(local_state);
browser_shutdown::RegisterPrefs(local_state);
chrome_browser_net::RegisterPrefs(local_state);
- MetricsLog::RegisterPrefs(local_state);
- MetricsService::RegisterPrefs(local_state);
PageInfoWindow::RegisterPrefs(local_state);
TaskManager::RegisterPrefs(local_state);
ExternalProtocolHandler::RegisterPrefs(local_state);