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

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

Issue 1033004: Adds GeolocationContentSettingsMap. (Closed)
Patch Set: Uses "RequestingOriginSettings" and allows empty embedder as a wildcard. 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
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/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/extensions/extension_prefs.h" 16 #include "chrome/browser/extensions/extension_prefs.h"
17 #include "chrome/browser/extensions/extensions_ui.h" 17 #include "chrome/browser/extensions/extensions_ui.h"
18 #include "chrome/browser/external_protocol_handler.h" 18 #include "chrome/browser/external_protocol_handler.h"
19 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
19 #include "chrome/browser/geolocation/geolocation_prefs.h" 20 #include "chrome/browser/geolocation/geolocation_prefs.h"
20 #include "chrome/browser/google_url_tracker.h" 21 #include "chrome/browser/google_url_tracker.h"
21 #include "chrome/browser/host_content_settings_map.h" 22 #include "chrome/browser/host_content_settings_map.h"
22 #include "chrome/browser/host_zoom_map.h" 23 #include "chrome/browser/host_zoom_map.h"
23 #include "chrome/browser/intranet_redirect_detector.h" 24 #include "chrome/browser/intranet_redirect_detector.h"
24 #include "chrome/browser/metrics/metrics_service.h" 25 #include "chrome/browser/metrics/metrics_service.h"
25 #include "chrome/browser/net/dns_global.h" 26 #include "chrome/browser/net/dns_global.h"
26 #include "chrome/browser/page_info_model.h" 27 #include "chrome/browser/page_info_model.h"
27 #include "chrome/browser/password_manager/password_manager.h" 28 #include "chrome/browser/password_manager/password_manager.h"
28 #include "chrome/browser/privacy_blacklist/blacklist.h" 29 #include "chrome/browser/privacy_blacklist/blacklist.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 TabContents::RegisterUserPrefs(user_prefs); 94 TabContents::RegisterUserPrefs(user_prefs);
94 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 95 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
95 ExtensionDOMUI::RegisterUserPrefs(user_prefs); 96 ExtensionDOMUI::RegisterUserPrefs(user_prefs);
96 ExtensionsUI::RegisterUserPrefs(user_prefs); 97 ExtensionsUI::RegisterUserPrefs(user_prefs);
97 NewTabUI::RegisterUserPrefs(user_prefs); 98 NewTabUI::RegisterUserPrefs(user_prefs);
98 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 99 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
99 HostZoomMap::RegisterUserPrefs(user_prefs); 100 HostZoomMap::RegisterUserPrefs(user_prefs);
100 DevToolsManager::RegisterUserPrefs(user_prefs); 101 DevToolsManager::RegisterUserPrefs(user_prefs);
101 Blacklist::RegisterUserPrefs(user_prefs); 102 Blacklist::RegisterUserPrefs(user_prefs);
102 ExtensionPrefs::RegisterUserPrefs(user_prefs); 103 ExtensionPrefs::RegisterUserPrefs(user_prefs);
104 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs);
103 #if defined(TOOLKIT_VIEWS) 105 #if defined(TOOLKIT_VIEWS)
104 BrowserActionsContainer::RegisterUserPrefs(user_prefs); 106 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
105 #elif defined(TOOLKIT_GTK) 107 #elif defined(TOOLKIT_GTK)
106 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 108 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
107 #endif 109 #endif
108 #if defined(OS_CHROMEOS) 110 #if defined(OS_CHROMEOS)
109 chromeos::Preferences::RegisterUserPrefs(user_prefs); 111 chromeos::Preferences::RegisterUserPrefs(user_prefs);
110 #endif 112 #endif
111 } 113 }
112 114
113 } // namespace browser 115 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698