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

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

Issue 207027: [Mac] Polish the search engine manager (Closed)
Patch Set: '' Created 11 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 (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/browser_prefs.h" 5 #include "chrome/browser/browser_prefs.h"
6 6
7 #include "chrome/browser/autofill_manager.h" 7 #include "chrome/browser/autofill_manager.h"
8 #include "chrome/browser/bookmarks/bookmark_utils.h" 8 #include "chrome/browser/bookmarks/bookmark_utils.h"
9 #include "chrome/browser/blocked_popup_container.h" 9 #include "chrome/browser/blocked_popup_container.h"
10 #include "chrome/browser/browser.h" 10 #include "chrome/browser/browser.h"
11 #include "chrome/browser/browser_shutdown.h" 11 #include "chrome/browser/browser_shutdown.h"
12 #include "chrome/browser/debugger/devtools_manager.h" 12 #include "chrome/browser/debugger/devtools_manager.h"
13 #include "chrome/browser/dom_ui/new_tab_ui.h" 13 #include "chrome/browser/dom_ui/new_tab_ui.h"
14 #include "chrome/browser/download/download_manager.h" 14 #include "chrome/browser/download/download_manager.h"
15 #include "chrome/browser/extensions/extension_dom_ui.h" 15 #include "chrome/browser/extensions/extension_dom_ui.h"
16 #include "chrome/browser/external_protocol_handler.h" 16 #include "chrome/browser/external_protocol_handler.h"
17 #include "chrome/browser/google_url_tracker.h" 17 #include "chrome/browser/google_url_tracker.h"
18 #include "chrome/browser/metrics/metrics_service.h" 18 #include "chrome/browser/metrics/metrics_service.h"
19 #include "chrome/browser/net/dns_global.h" 19 #include "chrome/browser/net/dns_global.h"
20 #include "chrome/browser/page_info_model.h" 20 #include "chrome/browser/page_info_model.h"
21 #include "chrome/browser/password_manager/password_manager.h" 21 #include "chrome/browser/password_manager/password_manager.h"
22 #include "chrome/browser/renderer_host/browser_render_process_host.h" 22 #include "chrome/browser/renderer_host/browser_render_process_host.h"
23 #include "chrome/browser/renderer_host/web_cache_manager.h" 23 #include "chrome/browser/renderer_host/web_cache_manager.h"
24 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 24 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
25 #include "chrome/browser/search_engines/keyword_editor_controller.h"
25 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 26 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
26 #include "chrome/browser/session_startup_pref.h" 27 #include "chrome/browser/session_startup_pref.h"
27 #include "chrome/browser/ssl/ssl_manager.h" 28 #include "chrome/browser/ssl/ssl_manager.h"
28 #include "chrome/browser/tab_contents/tab_contents.h" 29 #include "chrome/browser/tab_contents/tab_contents.h"
29 30
30 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port 31 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
31 #include "chrome/browser/views/frame/browser_view.h" 32 #include "chrome/browser/views/frame/browser_view.h"
32 #endif 33 #endif
33 34
34 #if defined(OS_WIN) || defined(OS_LINUX) 35 #if defined(OS_WIN) || defined(OS_LINUX)
35 #include "chrome/browser/task_manager.h" 36 #include "chrome/browser/task_manager.h"
36 #endif 37 #endif
37 38
38 #if defined(OS_WIN) 39 #if defined(OS_WIN)
39 #include "chrome/browser/views/keyword_editor_view.h" 40 #include "chrome/browser/views/keyword_editor_view.h"
40 #endif 41 #endif
41 42
42 #if defined(TOOLKIT_GTK) 43 #if defined(TOOLKIT_GTK)
43 #include "chrome/browser/gtk/browser_window_gtk.h" 44 #include "chrome/browser/gtk/browser_window_gtk.h"
44 #endif 45 #endif
45 46
46 namespace browser { 47 namespace browser {
47 48
48 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { 49 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
49 // Prefs in Local State 50 // Prefs in Local State
50 Browser::RegisterPrefs(local_state); 51 Browser::RegisterPrefs(local_state);
51 WebCacheManager::RegisterPrefs(local_state); 52 WebCacheManager::RegisterPrefs(local_state);
52 ExternalProtocolHandler::RegisterPrefs(local_state); 53 ExternalProtocolHandler::RegisterPrefs(local_state);
53 GoogleURLTracker::RegisterPrefs(local_state); 54 GoogleURLTracker::RegisterPrefs(local_state);
55 KeywordEditorController::RegisterPrefs(local_state);
54 MetricsLog::RegisterPrefs(local_state); 56 MetricsLog::RegisterPrefs(local_state);
55 MetricsService::RegisterPrefs(local_state); 57 MetricsService::RegisterPrefs(local_state);
56 SafeBrowsingService::RegisterPrefs(local_state); 58 SafeBrowsingService::RegisterPrefs(local_state);
57 browser_shutdown::RegisterPrefs(local_state); 59 browser_shutdown::RegisterPrefs(local_state);
58 chrome_browser_net::RegisterPrefs(local_state); 60 chrome_browser_net::RegisterPrefs(local_state);
59 bookmark_utils::RegisterPrefs(local_state); 61 bookmark_utils::RegisterPrefs(local_state);
60 PageInfoModel::RegisterPrefs(local_state); 62 PageInfoModel::RegisterPrefs(local_state);
61 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port 63 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
62 BrowserView::RegisterBrowserViewPrefs(local_state); 64 BrowserView::RegisterBrowserViewPrefs(local_state);
63 #endif 65 #endif
(...skipping 15 matching lines...) Expand all
79 ExtensionDOMUI::RegisterUserPrefs(user_prefs); 81 ExtensionDOMUI::RegisterUserPrefs(user_prefs);
80 NewTabUI::RegisterUserPrefs(user_prefs); 82 NewTabUI::RegisterUserPrefs(user_prefs);
81 BlockedPopupContainer::RegisterUserPrefs(user_prefs); 83 BlockedPopupContainer::RegisterUserPrefs(user_prefs);
82 DevToolsManager::RegisterUserPrefs(user_prefs); 84 DevToolsManager::RegisterUserPrefs(user_prefs);
83 #if defined(TOOLKIT_GTK) 85 #if defined(TOOLKIT_GTK)
84 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 86 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
85 #endif 87 #endif
86 } 88 }
87 89
88 } // namespace browser 90 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698