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

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

Issue 1226643002: Welcome page changes for Windows 10 and over. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix RestoreOnStartupURLsPolicySpecified Created 5 years, 5 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 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 <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "chrome/browser/tracing/chrome_tracing_delegate.h" 61 #include "chrome/browser/tracing/chrome_tracing_delegate.h"
62 #include "chrome/browser/ui/app_list/app_list_prefs.h" 62 #include "chrome/browser/ui/app_list/app_list_prefs.h"
63 #include "chrome/browser/ui/app_list/app_list_service.h" 63 #include "chrome/browser/ui/app_list/app_list_service.h"
64 #include "chrome/browser/ui/browser_ui_prefs.h" 64 #include "chrome/browser/ui/browser_ui_prefs.h"
65 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 65 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
66 #include "chrome/browser/ui/network_profile_bubble.h" 66 #include "chrome/browser/ui/network_profile_bubble.h"
67 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 67 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
68 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 68 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
69 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 69 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
70 #include "chrome/browser/ui/startup/default_browser_prompt.h" 70 #include "chrome/browser/ui/startup/default_browser_prompt.h"
71 #include "chrome/browser/ui/startup/startup_browser_creator.h"
71 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 72 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
72 #include "chrome/browser/ui/webui/flags_ui.h" 73 #include "chrome/browser/ui/webui/flags_ui.h"
73 #include "chrome/browser/ui/webui/instant_ui.h" 74 #include "chrome/browser/ui/webui/instant_ui.h"
74 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 75 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
75 #include "chrome/browser/ui/webui/plugins_ui.h" 76 #include "chrome/browser/ui/webui/plugins_ui.h"
76 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 77 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
77 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" 78 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
78 #include "chrome/browser/upgrade_detector.h" 79 #include "chrome/browser/upgrade_detector.h"
79 #include "chrome/browser/web_resource/promo_resource_service.h" 80 #include "chrome/browser/web_resource/promo_resource_service.h"
80 #include "chrome/common/pref_names.h" 81 #include "chrome/common/pref_names.h"
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 348
348 #if defined(OS_MACOSX) 349 #if defined(OS_MACOSX)
349 confirm_quit::RegisterLocalState(registry); 350 confirm_quit::RegisterLocalState(registry);
350 QuitWithAppsController::RegisterPrefs(registry); 351 QuitWithAppsController::RegisterPrefs(registry);
351 #endif 352 #endif
352 353
353 #if defined(OS_WIN) 354 #if defined(OS_WIN)
354 app_metro_launch::RegisterPrefs(registry); 355 app_metro_launch::RegisterPrefs(registry);
355 component_updater::RegisterPrefsForSwReporter(registry); 356 component_updater::RegisterPrefsForSwReporter(registry);
356 password_manager::PasswordManager::RegisterLocalPrefs(registry); 357 password_manager::PasswordManager::RegisterLocalPrefs(registry);
358 StartupBrowserCreator::RegisterLocalStatePrefs(registry);
357 #endif 359 #endif
358 360
359 #if defined(TOOLKIT_VIEWS) 361 #if defined(TOOLKIT_VIEWS)
360 RegisterBrowserViewLocalPrefs(registry); 362 RegisterBrowserViewLocalPrefs(registry);
361 #endif 363 #endif
362 364
363 // Preferences registered only for migration (clearing or moving to a new key) 365 // Preferences registered only for migration (clearing or moving to a new key)
364 // go here. 366 // go here.
365 #if !defined(OS_ANDROID) 367 #if !defined(OS_ANDROID)
366 registry->RegisterDictionaryPref(kLegacyProfileResetPromptMemento); 368 registry->RegisterDictionaryPref(kLegacyProfileResetPromptMemento);
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); 632 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
631 633
632 // We're done migrating the profile per-host zoom level values, so we clear 634 // We're done migrating the profile per-host zoom level values, so we clear
633 // them all. 635 // them all.
634 DictionaryPrefUpdate host_zoom_dictionary_update( 636 DictionaryPrefUpdate host_zoom_dictionary_update(
635 prefs, prefs::kPerHostZoomLevelsDeprecated); 637 prefs, prefs::kPerHostZoomLevelsDeprecated);
636 host_zoom_dictionary_update->Clear(); 638 host_zoom_dictionary_update->Clear();
637 } 639 }
638 640
639 } // namespace chrome 641 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698