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

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

Issue 7976023: Remove the old chrome://extensions page, since the URL now redirects to the new Settings page.BUG... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/extensions_ui.cc ('k') | chrome/browser/resources/extensions_ui.html » ('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/background_contents_service.h" 9 #include "chrome/browser/background/background_contents_service.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/browser_shutdown.h" 13 #include "chrome/browser/browser_shutdown.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
16 #include "chrome/browser/debugger/devtools_window.h" 16 #include "chrome/browser/debugger/devtools_window.h"
17 #include "chrome/browser/download/download_prefs.h" 17 #include "chrome/browser/download/download_prefs.h"
18 #include "chrome/browser/extensions/apps_promo.h" 18 #include "chrome/browser/extensions/apps_promo.h"
19 #include "chrome/browser/extensions/extension_prefs.h" 19 #include "chrome/browser/extensions/extension_prefs.h"
20 #include "chrome/browser/extensions/extension_web_ui.h" 20 #include "chrome/browser/extensions/extension_web_ui.h"
21 #include "chrome/browser/extensions/extensions_ui.h"
22 #include "chrome/browser/external_protocol/external_protocol_handler.h" 21 #include "chrome/browser/external_protocol/external_protocol_handler.h"
23 #include "chrome/browser/geolocation/geolocation_prefs.h" 22 #include "chrome/browser/geolocation/geolocation_prefs.h"
24 #include "chrome/browser/google/google_url_tracker.h" 23 #include "chrome/browser/google/google_url_tracker.h"
25 #include "chrome/browser/instant/instant_controller.h" 24 #include "chrome/browser/instant/instant_controller.h"
26 #include "chrome/browser/intranet_redirect_detector.h" 25 #include "chrome/browser/intranet_redirect_detector.h"
27 #include "chrome/browser/metrics/metrics_log.h" 26 #include "chrome/browser/metrics/metrics_log.h"
28 #include "chrome/browser/metrics/metrics_service.h" 27 #include "chrome/browser/metrics/metrics_service.h"
29 #include "chrome/browser/net/net_pref_observer.h" 28 #include "chrome/browser/net/net_pref_observer.h"
30 #include "chrome/browser/net/predictor.h" 29 #include "chrome/browser/net/predictor.h"
31 #include "chrome/browser/net/pref_proxy_config_service.h" 30 #include "chrome/browser/net/pref_proxy_config_service.h"
(...skipping 18 matching lines...) Expand all
50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 49 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
51 #include "chrome/browser/sync/signin_manager.h" 50 #include "chrome/browser/sync/signin_manager.h"
52 #include "chrome/browser/tabs/pinned_tab_codec.h" 51 #include "chrome/browser/tabs/pinned_tab_codec.h"
53 #include "chrome/browser/task_manager/task_manager.h" 52 #include "chrome/browser/task_manager/task_manager.h"
54 #include "chrome/browser/translate/translate_prefs.h" 53 #include "chrome/browser/translate/translate_prefs.h"
55 #include "chrome/browser/ui/browser.h" 54 #include "chrome/browser/ui/browser.h"
56 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 55 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
57 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 56 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
58 #include "chrome/browser/ui/webui/flags_ui.h" 57 #include "chrome/browser/ui/webui/flags_ui.h"
59 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 58 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
59 #include "chrome/browser/ui/webui/options/extension_settings_handler.h"
60 #include "chrome/browser/ui/webui/plugins_ui.h" 60 #include "chrome/browser/ui/webui/plugins_ui.h"
61 #include "chrome/browser/upgrade_detector.h" 61 #include "chrome/browser/upgrade_detector.h"
62 #include "chrome/browser/web_resource/promo_resource_service.h" 62 #include "chrome/browser/web_resource/promo_resource_service.h"
63 #include "chrome/common/pref_names.h" 63 #include "chrome/common/pref_names.h"
64 #include "content/browser/host_zoom_map.h" 64 #include "content/browser/host_zoom_map.h"
65 #include "content/browser/renderer_host/browser_render_process_host.h" 65 #include "content/browser/renderer_host/browser_render_process_host.h"
66 #include "content/browser/ssl/ssl_manager.h" 66 #include "content/browser/ssl/ssl_manager.h"
67 67
68 #if defined(OS_MACOSX) 68 #if defined(OS_MACOSX)
69 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" 69 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 SessionStartupPref::RegisterUserPrefs(user_prefs); 145 SessionStartupPref::RegisterUserPrefs(user_prefs);
146 BookmarkModel::RegisterUserPrefs(user_prefs); 146 BookmarkModel::RegisterUserPrefs(user_prefs);
147 Browser::RegisterUserPrefs(user_prefs); 147 Browser::RegisterUserPrefs(user_prefs);
148 PasswordManager::RegisterUserPrefs(user_prefs); 148 PasswordManager::RegisterUserPrefs(user_prefs);
149 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); 149 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
150 DownloadPrefs::RegisterUserPrefs(user_prefs); 150 DownloadPrefs::RegisterUserPrefs(user_prefs);
151 bookmark_utils::RegisterUserPrefs(user_prefs); 151 bookmark_utils::RegisterUserPrefs(user_prefs);
152 TabContentsWrapper::RegisterUserPrefs(user_prefs); 152 TabContentsWrapper::RegisterUserPrefs(user_prefs);
153 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 153 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
154 ExtensionWebUI::RegisterUserPrefs(user_prefs); 154 ExtensionWebUI::RegisterUserPrefs(user_prefs);
155 ExtensionsUI::RegisterUserPrefs(user_prefs); 155 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
156 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 156 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
157 NewTabUI::RegisterUserPrefs(user_prefs); 157 NewTabUI::RegisterUserPrefs(user_prefs);
158 PluginPrefs::RegisterPrefs(user_prefs); 158 PluginPrefs::RegisterPrefs(user_prefs);
159 PluginsUI::RegisterUserPrefs(user_prefs); 159 PluginsUI::RegisterUserPrefs(user_prefs);
160 ProfileImpl::RegisterUserPrefs(user_prefs); 160 ProfileImpl::RegisterUserPrefs(user_prefs);
161 PromoResourceService::RegisterUserPrefs(user_prefs); 161 PromoResourceService::RegisterUserPrefs(user_prefs);
162 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 162 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
163 DevToolsWindow::RegisterUserPrefs(user_prefs); 163 DevToolsWindow::RegisterUserPrefs(user_prefs);
164 PinnedTabCodec::RegisterUserPrefs(user_prefs); 164 PinnedTabCodec::RegisterUserPrefs(user_prefs);
165 ExtensionPrefs::RegisterUserPrefs(user_prefs); 165 ExtensionPrefs::RegisterUserPrefs(user_prefs);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 212 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
213 } 213 }
214 local_state->ClearPref(prefs::kBrowserWindowPlacement); 214 local_state->ClearPref(prefs::kBrowserWindowPlacement);
215 215
216 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 216 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
217 current_version | WINDOWS_PREFS); 217 current_version | WINDOWS_PREFS);
218 } 218 }
219 } 219 }
220 220
221 } // namespace browser 221 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extensions_ui.cc ('k') | chrome/browser/resources/extensions_ui.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698