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

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

Issue 6537015: Start moving core pieces of Chrome multi-process code to src\content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/renderer_host/render_view_host.cc » ('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) 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 28 matching lines...) Expand all
39 #include "chrome/browser/prefs/session_startup_pref.h" 39 #include "chrome/browser/prefs/session_startup_pref.h"
40 #include "chrome/browser/profiles/profile_impl.h" 40 #include "chrome/browser/profiles/profile_impl.h"
41 #include "chrome/browser/renderer_host/browser_render_process_host.h" 41 #include "chrome/browser/renderer_host/browser_render_process_host.h"
42 #include "chrome/browser/renderer_host/web_cache_manager.h" 42 #include "chrome/browser/renderer_host/web_cache_manager.h"
43 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 43 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
44 #include "chrome/browser/search_engines/keyword_editor_controller.h" 44 #include "chrome/browser/search_engines/keyword_editor_controller.h"
45 #include "chrome/browser/search_engines/template_url_model.h" 45 #include "chrome/browser/search_engines/template_url_model.h"
46 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 46 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
47 #include "chrome/browser/ssl/ssl_manager.h" 47 #include "chrome/browser/ssl/ssl_manager.h"
48 #include "chrome/browser/sync/signin_manager.h" 48 #include "chrome/browser/sync/signin_manager.h"
49 #include "chrome/browser/tab_contents/tab_contents.h"
50 #include "chrome/browser/tabs/pinned_tab_codec.h" 49 #include "chrome/browser/tabs/pinned_tab_codec.h"
51 #include "chrome/browser/task_manager/task_manager.h" 50 #include "chrome/browser/task_manager/task_manager.h"
52 #include "chrome/browser/translate/translate_prefs.h" 51 #include "chrome/browser/translate/translate_prefs.h"
53 #include "chrome/browser/ui/browser.h" 52 #include "chrome/browser/ui/browser.h"
53 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
54 #include "chrome/browser/upgrade_detector.h" 54 #include "chrome/browser/upgrade_detector.h"
55 #include "chrome/browser/webui/flags_ui.h" 55 #include "chrome/browser/webui/flags_ui.h"
56 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
57 57
58 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port 58 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
59 #include "chrome/browser/ui/views/browser_actions_container.h" 59 #include "chrome/browser/ui/views/browser_actions_container.h"
60 #include "chrome/browser/ui/views/frame/browser_view.h" 60 #include "chrome/browser/ui/views/frame/browser_view.h"
61 #endif 61 #endif
62 62
63 #if defined(TOOLKIT_GTK) 63 #if defined(TOOLKIT_GTK)
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 void RegisterUserPrefs(PrefService* user_prefs) { 118 void RegisterUserPrefs(PrefService* user_prefs) {
119 // User prefs 119 // User prefs
120 AutoFillManager::RegisterUserPrefs(user_prefs); 120 AutoFillManager::RegisterUserPrefs(user_prefs);
121 SessionStartupPref::RegisterUserPrefs(user_prefs); 121 SessionStartupPref::RegisterUserPrefs(user_prefs);
122 Browser::RegisterUserPrefs(user_prefs); 122 Browser::RegisterUserPrefs(user_prefs);
123 PasswordManager::RegisterUserPrefs(user_prefs); 123 PasswordManager::RegisterUserPrefs(user_prefs);
124 chrome_browser_net::RegisterUserPrefs(user_prefs); 124 chrome_browser_net::RegisterUserPrefs(user_prefs);
125 DownloadPrefs::RegisterUserPrefs(user_prefs); 125 DownloadPrefs::RegisterUserPrefs(user_prefs);
126 bookmark_utils::RegisterUserPrefs(user_prefs); 126 bookmark_utils::RegisterUserPrefs(user_prefs);
127 TabContents::RegisterUserPrefs(user_prefs); 127 TabContentsWrapper::RegisterUserPrefs(user_prefs);
128 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 128 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
129 ExtensionWebUI::RegisterUserPrefs(user_prefs); 129 ExtensionWebUI::RegisterUserPrefs(user_prefs);
130 ExtensionsUI::RegisterUserPrefs(user_prefs); 130 ExtensionsUI::RegisterUserPrefs(user_prefs);
131 NewTabUI::RegisterUserPrefs(user_prefs); 131 NewTabUI::RegisterUserPrefs(user_prefs);
132 PluginsUI::RegisterUserPrefs(user_prefs); 132 PluginsUI::RegisterUserPrefs(user_prefs);
133 ProfileImpl::RegisterUserPrefs(user_prefs); 133 ProfileImpl::RegisterUserPrefs(user_prefs);
134 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 134 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
135 HostZoomMap::RegisterUserPrefs(user_prefs); 135 HostZoomMap::RegisterUserPrefs(user_prefs);
136 DevToolsManager::RegisterUserPrefs(user_prefs); 136 DevToolsManager::RegisterUserPrefs(user_prefs);
137 PinnedTabCodec::RegisterUserPrefs(user_prefs); 137 PinnedTabCodec::RegisterUserPrefs(user_prefs);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 GetValue())); 181 GetValue()));
182 } 182 }
183 local_state->ClearPref(prefs::kBrowserWindowPlacement); 183 local_state->ClearPref(prefs::kBrowserWindowPlacement);
184 184
185 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 185 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
186 current_version | WINDOWS_PREFS); 186 current_version | WINDOWS_PREFS);
187 } 187 }
188 } 188 }
189 189
190 } // namespace browser 190 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/renderer_host/render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698