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_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 26 matching lines...) Expand all Loading... |
37 #include "chrome/browser/policy/profile_policy_connector.h" | 37 #include "chrome/browser/policy/profile_policy_connector.h" |
38 #include "chrome/browser/prefs/session_startup_pref.h" | 38 #include "chrome/browser/prefs/session_startup_pref.h" |
39 #include "chrome/browser/profiles/profile_impl.h" | 39 #include "chrome/browser/profiles/profile_impl.h" |
40 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 40 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
41 #include "chrome/browser/renderer_host/web_cache_manager.h" | 41 #include "chrome/browser/renderer_host/web_cache_manager.h" |
42 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 42 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
43 #include "chrome/browser/search_engines/template_url_model.h" | 43 #include "chrome/browser/search_engines/template_url_model.h" |
44 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 44 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
45 #include "chrome/browser/ssl/ssl_manager.h" | 45 #include "chrome/browser/ssl/ssl_manager.h" |
46 #include "chrome/browser/sync/signin_manager.h" | 46 #include "chrome/browser/sync/signin_manager.h" |
| 47 #include "chrome/browser/tab_contents/introducer_handler.h" |
47 #include "chrome/browser/tabs/pinned_tab_codec.h" | 48 #include "chrome/browser/tabs/pinned_tab_codec.h" |
48 #include "chrome/browser/task_manager/task_manager.h" | 49 #include "chrome/browser/task_manager/task_manager.h" |
49 #include "chrome/browser/translate/translate_prefs.h" | 50 #include "chrome/browser/translate/translate_prefs.h" |
50 #include "chrome/browser/ui/browser.h" | 51 #include "chrome/browser/ui/browser.h" |
51 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 52 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
52 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 53 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
53 #include "chrome/browser/ui/webui/flags_ui.h" | 54 #include "chrome/browser/ui/webui/flags_ui.h" |
54 #include "chrome/browser/ui/webui/new_tab_ui.h" | 55 #include "chrome/browser/ui/webui/new_tab_ui.h" |
55 #include "chrome/browser/ui/webui/plugins_ui.h" | 56 #include "chrome/browser/ui/webui/plugins_ui.h" |
56 #include "chrome/browser/upgrade_detector.h" | 57 #include "chrome/browser/upgrade_detector.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 NewTabUI::RegisterUserPrefs(user_prefs); | 131 NewTabUI::RegisterUserPrefs(user_prefs); |
131 PluginsUI::RegisterUserPrefs(user_prefs); | 132 PluginsUI::RegisterUserPrefs(user_prefs); |
132 ProfileImpl::RegisterUserPrefs(user_prefs); | 133 ProfileImpl::RegisterUserPrefs(user_prefs); |
133 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 134 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
134 HostZoomMap::RegisterUserPrefs(user_prefs); | 135 HostZoomMap::RegisterUserPrefs(user_prefs); |
135 DevToolsManager::RegisterUserPrefs(user_prefs); | 136 DevToolsManager::RegisterUserPrefs(user_prefs); |
136 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 137 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
137 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 138 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
138 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); | 139 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); |
139 TranslatePrefs::RegisterUserPrefs(user_prefs); | 140 TranslatePrefs::RegisterUserPrefs(user_prefs); |
| 141 IntroducerService::RegisterUserPrefs(user_prefs); |
140 DesktopNotificationService::RegisterUserPrefs(user_prefs); | 142 DesktopNotificationService::RegisterUserPrefs(user_prefs); |
141 PrefProxyConfigService::RegisterPrefs(user_prefs); | 143 PrefProxyConfigService::RegisterPrefs(user_prefs); |
142 #if defined(TOOLKIT_VIEWS) | 144 #if defined(TOOLKIT_VIEWS) |
143 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 145 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
144 #elif defined(TOOLKIT_GTK) | 146 #elif defined(TOOLKIT_GTK) |
145 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 147 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
146 #endif | 148 #endif |
147 #if defined(OS_CHROMEOS) | 149 #if defined(OS_CHROMEOS) |
148 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 150 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
149 #endif | 151 #endif |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 184 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
183 } | 185 } |
184 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 186 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
185 | 187 |
186 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 188 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
187 current_version | WINDOWS_PREFS); | 189 current_version | WINDOWS_PREFS); |
188 } | 190 } |
189 } | 191 } |
190 | 192 |
191 } // namespace browser | 193 } // namespace browser |
OLD | NEW |