Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2006973002: Background tracing: Enable field-trial control on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/tracing/chrome_tracing_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 99e169ca20ef3f33fcaf0941d74872552705357e..9fa140ae915edd6ba90aecc7b22879ea05e94eb6 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -298,6 +298,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
browser_shutdown::RegisterPrefs(registry);
BrowserProcessImpl::RegisterPrefs(registry);
ChromeMetricsServiceClient::RegisterPrefs(registry);
+ ChromeTracingDelegate::RegisterPrefs(registry);
chrome_prefs::RegisterPrefs(registry);
variations::VariationsService::RegisterPrefs(registry);
component_updater::RegisterPrefsForRecoveryComponent(registry);
@@ -345,7 +346,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
#endif
#if !defined(OS_ANDROID)
- ChromeTracingDelegate::RegisterPrefs(registry);
RegisterBrowserPrefs(registry);
StartupBrowserCreator::RegisterLocalStatePrefs(registry);
// The native GCM is used on Android instead.
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/tracing/chrome_tracing_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698