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

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

Issue 1085003: Implement chrome://plugins page that can disable plugins. (Closed)
Patch Set: merge ToT again Created 10 years, 9 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
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/browser_resources.grd » ('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/browser_prefs.h" 5 #include "chrome/browser/browser_prefs.h"
6 6
7 #include "chrome/browser/autofill/autofill_manager.h" 7 #include "chrome/browser/autofill/autofill_manager.h"
8 #include "chrome/browser/bookmarks/bookmark_utils.h" 8 #include "chrome/browser/bookmarks/bookmark_utils.h"
9 #include "chrome/browser/browser.h" 9 #include "chrome/browser/browser.h"
10 #include "chrome/browser/browser_shutdown.h" 10 #include "chrome/browser/browser_shutdown.h"
11 #include "chrome/browser/cookie_modal_dialog.h" 11 #include "chrome/browser/cookie_modal_dialog.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/dom_ui/plugins_ui.h"
14 #include "chrome/browser/download/download_manager.h" 15 #include "chrome/browser/download/download_manager.h"
15 #include "chrome/browser/extensions/extension_dom_ui.h" 16 #include "chrome/browser/extensions/extension_dom_ui.h"
16 #include "chrome/browser/extensions/extension_prefs.h" 17 #include "chrome/browser/extensions/extension_prefs.h"
17 #include "chrome/browser/extensions/extensions_ui.h" 18 #include "chrome/browser/extensions/extensions_ui.h"
18 #include "chrome/browser/external_protocol_handler.h" 19 #include "chrome/browser/external_protocol_handler.h"
19 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 20 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
20 #include "chrome/browser/geolocation/geolocation_prefs.h" 21 #include "chrome/browser/geolocation/geolocation_prefs.h"
21 #include "chrome/browser/google_url_tracker.h" 22 #include "chrome/browser/google_url_tracker.h"
22 #include "chrome/browser/host_content_settings_map.h" 23 #include "chrome/browser/host_content_settings_map.h"
23 #include "chrome/browser/host_zoom_map.h" 24 #include "chrome/browser/host_zoom_map.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 PasswordManager::RegisterUserPrefs(user_prefs); 91 PasswordManager::RegisterUserPrefs(user_prefs);
91 chrome_browser_net::RegisterUserPrefs(user_prefs); 92 chrome_browser_net::RegisterUserPrefs(user_prefs);
92 DownloadManager::RegisterUserPrefs(user_prefs); 93 DownloadManager::RegisterUserPrefs(user_prefs);
93 SSLManager::RegisterUserPrefs(user_prefs); 94 SSLManager::RegisterUserPrefs(user_prefs);
94 bookmark_utils::RegisterUserPrefs(user_prefs); 95 bookmark_utils::RegisterUserPrefs(user_prefs);
95 TabContents::RegisterUserPrefs(user_prefs); 96 TabContents::RegisterUserPrefs(user_prefs);
96 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 97 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
97 ExtensionDOMUI::RegisterUserPrefs(user_prefs); 98 ExtensionDOMUI::RegisterUserPrefs(user_prefs);
98 ExtensionsUI::RegisterUserPrefs(user_prefs); 99 ExtensionsUI::RegisterUserPrefs(user_prefs);
99 NewTabUI::RegisterUserPrefs(user_prefs); 100 NewTabUI::RegisterUserPrefs(user_prefs);
101 PluginsUI::RegisterUserPrefs(user_prefs);
100 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 102 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
101 HostZoomMap::RegisterUserPrefs(user_prefs); 103 HostZoomMap::RegisterUserPrefs(user_prefs);
102 DevToolsManager::RegisterUserPrefs(user_prefs); 104 DevToolsManager::RegisterUserPrefs(user_prefs);
103 Blacklist::RegisterUserPrefs(user_prefs); 105 Blacklist::RegisterUserPrefs(user_prefs);
104 PinnedTabCodec::RegisterUserPrefs(user_prefs); 106 PinnedTabCodec::RegisterUserPrefs(user_prefs);
105 ExtensionPrefs::RegisterUserPrefs(user_prefs); 107 ExtensionPrefs::RegisterUserPrefs(user_prefs);
106 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); 108 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs);
107 #if defined(TOOLKIT_VIEWS) 109 #if defined(TOOLKIT_VIEWS)
108 BrowserActionsContainer::RegisterUserPrefs(user_prefs); 110 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
109 #elif defined(TOOLKIT_GTK) 111 #elif defined(TOOLKIT_GTK)
110 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 112 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
111 #endif 113 #endif
112 #if defined(OS_CHROMEOS) 114 #if defined(OS_CHROMEOS)
113 chromeos::Preferences::RegisterUserPrefs(user_prefs); 115 chromeos::Preferences::RegisterUserPrefs(user_prefs);
114 #endif 116 #endif
115 } 117 }
116 118
117 } // namespace browser 119 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698