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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 599653002: SRT Bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged in ToT. Created 6 years, 3 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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 chromeos::proxy_config::RegisterProfilePrefs(registry); 477 chromeos::proxy_config::RegisterProfilePrefs(registry);
478 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 478 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
479 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 479 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
480 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 480 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
481 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 481 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
482 RegisterProfilePrefs(registry); 482 RegisterProfilePrefs(registry);
483 FlagsUI::RegisterProfilePrefs(registry); 483 FlagsUI::RegisterProfilePrefs(registry);
484 #endif 484 #endif
485 485
486 #if defined(OS_WIN) 486 #if defined(OS_WIN)
487 component_updater::RegisterProfilePrefsForSwReporter(registry);
487 NetworkProfileBubble::RegisterProfilePrefs(registry); 488 NetworkProfileBubble::RegisterProfilePrefs(registry);
488 #endif 489 #endif
489 490
490 #if defined(TOOLKIT_VIEWS) 491 #if defined(TOOLKIT_VIEWS)
491 RegisterBrowserViewProfilePrefs(registry); 492 RegisterBrowserViewProfilePrefs(registry);
492 RegisterInvertBubbleUserPrefs(registry); 493 RegisterInvertBubbleUserPrefs(registry);
493 #endif 494 #endif
494 495
495 #if defined(USE_ASH) 496 #if defined(USE_ASH)
496 ash::RegisterChromeLauncherUserPrefs(registry); 497 ash::RegisterChromeLauncherUserPrefs(registry);
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 #if defined(OS_CHROMEOS) 623 #if defined(OS_CHROMEOS)
623 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 624 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
624 #endif 625 #endif
625 626
626 #if defined(TOOLKIT_VIEWS) 627 #if defined(TOOLKIT_VIEWS)
627 MigrateBrowserTabStripPrefs(local_state); 628 MigrateBrowserTabStripPrefs(local_state);
628 #endif 629 #endif
629 } 630 }
630 631
631 } // namespace chrome 632 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/sw_reporter_installer_win.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698