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

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

Issue 5368002: Move Mac LaunchOnStartup enable/disable to File thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed previous attempt to resolve merge conflict Created 10 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/background_mode_manager_win.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 WizardController::RegisterPrefs(local_state); 105 WizardController::RegisterPrefs(local_state);
106 chromeos::InputMethodMenuButton::RegisterPrefs(local_state); 106 chromeos::InputMethodMenuButton::RegisterPrefs(local_state);
107 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); 107 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state);
108 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); 108 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);
109 #endif 109 #endif
110 } 110 }
111 111
112 void RegisterUserPrefs(PrefService* user_prefs) { 112 void RegisterUserPrefs(PrefService* user_prefs) {
113 // User prefs 113 // User prefs
114 AutoFillManager::RegisterUserPrefs(user_prefs); 114 AutoFillManager::RegisterUserPrefs(user_prefs);
115 BackgroundModeManager::RegisterUserPrefs(user_prefs);
116 SessionStartupPref::RegisterUserPrefs(user_prefs); 115 SessionStartupPref::RegisterUserPrefs(user_prefs);
117 Browser::RegisterUserPrefs(user_prefs); 116 Browser::RegisterUserPrefs(user_prefs);
118 PasswordManager::RegisterUserPrefs(user_prefs); 117 PasswordManager::RegisterUserPrefs(user_prefs);
119 chrome_browser_net::RegisterUserPrefs(user_prefs); 118 chrome_browser_net::RegisterUserPrefs(user_prefs);
120 DownloadPrefs::RegisterUserPrefs(user_prefs); 119 DownloadPrefs::RegisterUserPrefs(user_prefs);
121 bookmark_utils::RegisterUserPrefs(user_prefs); 120 bookmark_utils::RegisterUserPrefs(user_prefs);
122 TabContents::RegisterUserPrefs(user_prefs); 121 TabContents::RegisterUserPrefs(user_prefs);
123 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 122 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
124 ExtensionDOMUI::RegisterUserPrefs(user_prefs); 123 ExtensionDOMUI::RegisterUserPrefs(user_prefs);
125 ExtensionsUI::RegisterUserPrefs(user_prefs); 124 ExtensionsUI::RegisterUserPrefs(user_prefs);
(...skipping 19 matching lines...) Expand all
145 chromeos::Preferences::RegisterUserPrefs(user_prefs); 144 chromeos::Preferences::RegisterUserPrefs(user_prefs);
146 #endif 145 #endif
147 BackgroundContentsService::RegisterUserPrefs(user_prefs); 146 BackgroundContentsService::RegisterUserPrefs(user_prefs);
148 SigninManager::RegisterUserPrefs(user_prefs); 147 SigninManager::RegisterUserPrefs(user_prefs);
149 TemplateURLModel::RegisterUserPrefs(user_prefs); 148 TemplateURLModel::RegisterUserPrefs(user_prefs);
150 InstantController::RegisterUserPrefs(user_prefs); 149 InstantController::RegisterUserPrefs(user_prefs);
151 NetPrefObserver::RegisterPrefs(user_prefs); 150 NetPrefObserver::RegisterPrefs(user_prefs);
152 } 151 }
153 152
154 } // namespace browser 153 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/background_mode_manager_win.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698