Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/background_contents_service.h" | 9 #include "chrome/browser/background/background_contents_service.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 #include "chrome/browser/profiles/profile_manager.h" | 45 #include "chrome/browser/profiles/profile_manager.h" |
| 46 #include "chrome/browser/remoting/firewall_traversal_tab_helper.h" | 46 #include "chrome/browser/remoting/firewall_traversal_tab_helper.h" |
| 47 #include "chrome/browser/renderer_host/web_cache_manager.h" | 47 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 48 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 48 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 49 #include "chrome/browser/search_engines/template_url_service.h" | 49 #include "chrome/browser/search_engines/template_url_service.h" |
| 50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 51 #include "chrome/browser/sync/signin_manager.h" | 51 #include "chrome/browser/sync/signin_manager.h" |
| 52 #include "chrome/browser/tabs/pinned_tab_codec.h" | 52 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 53 #include "chrome/browser/task_manager/task_manager.h" | 53 #include "chrome/browser/task_manager/task_manager.h" |
| 54 #include "chrome/browser/translate/translate_prefs.h" | 54 #include "chrome/browser/translate/translate_prefs.h" |
| 55 #include "chrome/browser/ui/autologin_infobar_delegate.h" | 55 #include "chrome/browser/ui/autologin_infobar_delegate.h" |
|
Roger Tawa OOO till Jul 10th
2011/08/03 12:23:49
should remove this #include
| |
| 56 #include "chrome/browser/ui/browser.h" | 56 #include "chrome/browser/ui/browser.h" |
| 57 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 57 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 58 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 58 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 59 #include "chrome/browser/ui/webui/flags_ui.h" | 59 #include "chrome/browser/ui/webui/flags_ui.h" |
| 60 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 60 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 61 #include "chrome/browser/ui/webui/plugins_ui.h" | 61 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 62 #include "chrome/browser/upgrade_detector.h" | 62 #include "chrome/browser/upgrade_detector.h" |
| 63 #include "chrome/browser/web_resource/promo_resource_service.h" | 63 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 64 #include "chrome/common/pref_names.h" | 64 #include "chrome/common/pref_names.h" |
| 65 #include "content/browser/host_zoom_map.h" | 65 #include "content/browser/host_zoom_map.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 132 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
| 133 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); | 133 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); |
| 134 chromeos::NetworkMenuButton::RegisterPrefs(local_state); | 134 chromeos::NetworkMenuButton::RegisterPrefs(local_state); |
| 135 #endif | 135 #endif |
| 136 } | 136 } |
| 137 | 137 |
| 138 void RegisterUserPrefs(PrefService* user_prefs) { | 138 void RegisterUserPrefs(PrefService* user_prefs) { |
| 139 // User prefs | 139 // User prefs |
| 140 AppsPromo::RegisterUserPrefs(user_prefs); | 140 AppsPromo::RegisterUserPrefs(user_prefs); |
| 141 AutofillManager::RegisterUserPrefs(user_prefs); | 141 AutofillManager::RegisterUserPrefs(user_prefs); |
| 142 AutoLoginInfoBarDelegate::RegisterUserPrefs(user_prefs); | |
| 143 SessionStartupPref::RegisterUserPrefs(user_prefs); | 142 SessionStartupPref::RegisterUserPrefs(user_prefs); |
| 144 BookmarkModel::RegisterUserPrefs(user_prefs); | 143 BookmarkModel::RegisterUserPrefs(user_prefs); |
| 145 Browser::RegisterUserPrefs(user_prefs); | 144 Browser::RegisterUserPrefs(user_prefs); |
| 146 PasswordManager::RegisterUserPrefs(user_prefs); | 145 PasswordManager::RegisterUserPrefs(user_prefs); |
| 147 chrome_browser_net::RegisterUserPrefs(user_prefs); | 146 chrome_browser_net::RegisterUserPrefs(user_prefs); |
| 148 DownloadPrefs::RegisterUserPrefs(user_prefs); | 147 DownloadPrefs::RegisterUserPrefs(user_prefs); |
| 149 bookmark_utils::RegisterUserPrefs(user_prefs); | 148 bookmark_utils::RegisterUserPrefs(user_prefs); |
| 150 TabContentsWrapper::RegisterUserPrefs(user_prefs); | 149 TabContentsWrapper::RegisterUserPrefs(user_prefs); |
| 151 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 150 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
| 152 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 151 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 207 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 206 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 208 } | 207 } |
| 209 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 208 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 210 | 209 |
| 211 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 210 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 212 current_version | WINDOWS_PREFS); | 211 current_version | WINDOWS_PREFS); |
| 213 } | 212 } |
| 214 } | 213 } |
| 215 | 214 |
| 216 } // namespace browser | 215 } // namespace browser |
| OLD | NEW |