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

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

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 10 #include "chrome/browser/about_flags.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "chrome/browser/ui/app_list/app_list_service.h" 73 #include "chrome/browser/ui/app_list/app_list_service.h"
74 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" 74 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
75 #include "chrome/browser/ui/browser_ui_prefs.h" 75 #include "chrome/browser/ui/browser_ui_prefs.h"
76 #include "chrome/browser/ui/network_profile_bubble.h" 76 #include "chrome/browser/ui/network_profile_bubble.h"
77 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 77 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
78 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 78 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
79 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 79 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
80 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 80 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
81 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 81 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
82 #include "chrome/browser/ui/webui/flags_ui.h" 82 #include "chrome/browser/ui/webui/flags_ui.h"
83 #include "chrome/browser/ui/webui/instant_ui.h"
84 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 83 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
85 #include "chrome/browser/ui/webui/plugins_ui.h" 84 #include "chrome/browser/ui/webui/plugins_ui.h"
86 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 85 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
87 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 86 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
88 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" 87 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
89 #include "chrome/browser/upgrade_detector.h" 88 #include "chrome/browser/upgrade_detector.h"
90 #include "chrome/browser/web_resource/promo_resource_service.h" 89 #include "chrome/browser/web_resource/promo_resource_service.h"
91 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
92 #include "components/user_prefs/pref_registry_syncable.h" 91 #include "components/user_prefs/pref_registry_syncable.h"
93 #include "content/public/browser/render_process_host.h" 92 #include "content/public/browser/render_process_host.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( 269 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs(
271 registry); 270 registry);
272 chrome_browser_net::Predictor::RegisterUserPrefs(registry); 271 chrome_browser_net::Predictor::RegisterUserPrefs(registry);
273 DownloadPrefs::RegisterUserPrefs(registry); 272 DownloadPrefs::RegisterUserPrefs(registry);
274 extensions::ComponentLoader::RegisterUserPrefs(registry); 273 extensions::ComponentLoader::RegisterUserPrefs(registry);
275 extensions::ExtensionPrefs::RegisterUserPrefs(registry); 274 extensions::ExtensionPrefs::RegisterUserPrefs(registry);
276 ExtensionWebUI::RegisterUserPrefs(registry); 275 ExtensionWebUI::RegisterUserPrefs(registry);
277 first_run::RegisterUserPrefs(registry); 276 first_run::RegisterUserPrefs(registry);
278 HostContentSettingsMap::RegisterUserPrefs(registry); 277 HostContentSettingsMap::RegisterUserPrefs(registry);
279 IncognitoModePrefs::RegisterUserPrefs(registry); 278 IncognitoModePrefs::RegisterUserPrefs(registry);
280 InstantUI::RegisterUserPrefs(registry);
281 browser_sync::InvalidatorStorage::RegisterUserPrefs(registry); 279 browser_sync::InvalidatorStorage::RegisterUserPrefs(registry);
282 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); 280 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);
283 MediaStreamDevicesController::RegisterUserPrefs(registry); 281 MediaStreamDevicesController::RegisterUserPrefs(registry);
284 NetPrefObserver::RegisterUserPrefs(registry); 282 NetPrefObserver::RegisterUserPrefs(registry);
285 NewTabUI::RegisterUserPrefs(registry); 283 NewTabUI::RegisterUserPrefs(registry);
286 PasswordManager::RegisterUserPrefs(registry); 284 PasswordManager::RegisterUserPrefs(registry);
287 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); 285 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry);
288 PrefsTabHelper::RegisterUserPrefs(registry); 286 PrefsTabHelper::RegisterUserPrefs(registry);
289 Profile::RegisterUserPrefs(registry); 287 Profile::RegisterUserPrefs(registry);
290 ProfileImpl::RegisterUserPrefs(registry); 288 ProfileImpl::RegisterUserPrefs(registry);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 431 }
434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 432 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
435 433
436 current_version |= GOOGLE_URL_TRACKER_PREFS; 434 current_version |= GOOGLE_URL_TRACKER_PREFS;
437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 435 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
438 current_version); 436 current_version);
439 } 437 }
440 } 438 }
441 439
442 } // namespace chrome 440 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698