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

Side by Side 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, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 } // namespace 291 } // namespace
292 292
293 namespace chrome { 293 namespace chrome {
294 294
295 void RegisterLocalState(PrefRegistrySimple* registry) { 295 void RegisterLocalState(PrefRegistrySimple* registry) {
296 // Please keep this list alphabetized. 296 // Please keep this list alphabetized.
297 AppListService::RegisterPrefs(registry); 297 AppListService::RegisterPrefs(registry);
298 browser_shutdown::RegisterPrefs(registry); 298 browser_shutdown::RegisterPrefs(registry);
299 BrowserProcessImpl::RegisterPrefs(registry); 299 BrowserProcessImpl::RegisterPrefs(registry);
300 ChromeMetricsServiceClient::RegisterPrefs(registry); 300 ChromeMetricsServiceClient::RegisterPrefs(registry);
301 ChromeTracingDelegate::RegisterPrefs(registry);
301 chrome_prefs::RegisterPrefs(registry); 302 chrome_prefs::RegisterPrefs(registry);
302 variations::VariationsService::RegisterPrefs(registry); 303 variations::VariationsService::RegisterPrefs(registry);
303 component_updater::RegisterPrefsForRecoveryComponent(registry); 304 component_updater::RegisterPrefsForRecoveryComponent(registry);
304 component_updater::SupervisedUserWhitelistInstaller::RegisterPrefs(registry); 305 component_updater::SupervisedUserWhitelistInstaller::RegisterPrefs(registry);
305 ExternalProtocolHandler::RegisterPrefs(registry); 306 ExternalProtocolHandler::RegisterPrefs(registry);
306 flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry); 307 flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry);
307 geolocation::RegisterPrefs(registry); 308 geolocation::RegisterPrefs(registry);
308 GLStringManager::RegisterPrefs(registry); 309 GLStringManager::RegisterPrefs(registry);
309 GpuModeManager::RegisterPrefs(registry); 310 GpuModeManager::RegisterPrefs(registry);
310 IntranetRedirectDetector::RegisterPrefs(registry); 311 IntranetRedirectDetector::RegisterPrefs(registry);
(...skipping 27 matching lines...) Expand all
338 339
339 #if defined(ENABLE_TASK_MANAGER) 340 #if defined(ENABLE_TASK_MANAGER)
340 task_management::TaskManagerInterface::RegisterPrefs(registry); 341 task_management::TaskManagerInterface::RegisterPrefs(registry);
341 #endif // defined(ENABLE_TASK_MANAGER) 342 #endif // defined(ENABLE_TASK_MANAGER)
342 343
343 #if BUILDFLAG(ENABLE_BACKGROUND) 344 #if BUILDFLAG(ENABLE_BACKGROUND)
344 BackgroundModeManager::RegisterPrefs(registry); 345 BackgroundModeManager::RegisterPrefs(registry);
345 #endif 346 #endif
346 347
347 #if !defined(OS_ANDROID) 348 #if !defined(OS_ANDROID)
348 ChromeTracingDelegate::RegisterPrefs(registry);
349 RegisterBrowserPrefs(registry); 349 RegisterBrowserPrefs(registry);
350 StartupBrowserCreator::RegisterLocalStatePrefs(registry); 350 StartupBrowserCreator::RegisterLocalStatePrefs(registry);
351 // The native GCM is used on Android instead. 351 // The native GCM is used on Android instead.
352 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); 352 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
353 UpgradeDetector::RegisterPrefs(registry); 353 UpgradeDetector::RegisterPrefs(registry);
354 #if !defined(OS_CHROMEOS) 354 #if !defined(OS_CHROMEOS)
355 RegisterDefaultBrowserPromptPrefs(registry); 355 RegisterDefaultBrowserPromptPrefs(registry);
356 #endif // !defined(OS_CHROMEOS) 356 #endif // !defined(OS_CHROMEOS)
357 #endif // !defined(OS_ANDROID) 357 #endif // !defined(OS_ANDROID)
358 358
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, 693 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined,
694 install_time.ToInternalValue()); 694 install_time.ToInternalValue());
695 } 695 }
696 profile_prefs->ClearPref(kCheckDefaultBrowser); 696 profile_prefs->ClearPref(kCheckDefaultBrowser);
697 697
698 // Added 5/2016. 698 // Added 5/2016.
699 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); 699 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
700 } 700 }
701 701
702 } // namespace chrome 702 } // namespace chrome
OLDNEW
« 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