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

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

Issue 2727813002: Options/MD Settings: use new prefs to drive import data dialog (Closed)
Patch Set: gab@ review Created 3 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 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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 #if defined(TOOLKIT_VIEWS) 249 #if defined(TOOLKIT_VIEWS)
250 #include "chrome/browser/ui/browser_view_prefs.h" 250 #include "chrome/browser/ui/browser_view_prefs.h"
251 #endif 251 #endif
252 252
253 #if defined(USE_ASH) 253 #if defined(USE_ASH)
254 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 254 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
255 #endif 255 #endif
256 256
257 #if !defined(OS_ANDROID) && !defined(OS_IOS) 257 #if !defined(OS_ANDROID) && !defined(OS_IOS)
258 #include "chrome/browser/ui/webui/md_history_ui.h" 258 #include "chrome/browser/ui/webui/md_history_ui.h"
259 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
259 #endif 260 #endif
260 261
261 namespace { 262 namespace {
262 263
263 #if BUILDFLAG(ENABLE_GOOGLE_NOW) 264 #if BUILDFLAG(ENABLE_GOOGLE_NOW)
264 // Deprecated 3/2016 265 // Deprecated 3/2016
265 const char kGoogleGeolocationAccessEnabled[] = 266 const char kGoogleGeolocationAccessEnabled[] =
266 "googlegeolocationaccess.enabled"; 267 "googlegeolocationaccess.enabled";
267 #endif 268 #endif
268 269
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 RegisterBrowserViewProfilePrefs(registry); 608 RegisterBrowserViewProfilePrefs(registry);
608 RegisterInvertBubbleUserPrefs(registry); 609 RegisterInvertBubbleUserPrefs(registry);
609 #endif 610 #endif
610 611
611 #if defined(USE_ASH) 612 #if defined(USE_ASH)
612 ash::launcher::RegisterChromeLauncherUserPrefs(registry); 613 ash::launcher::RegisterChromeLauncherUserPrefs(registry);
613 #endif 614 #endif
614 615
615 #if !defined(OS_ANDROID) && !defined(OS_IOS) 616 #if !defined(OS_ANDROID) && !defined(OS_IOS)
616 MdHistoryUI::RegisterProfilePrefs(registry); 617 MdHistoryUI::RegisterProfilePrefs(registry);
618 settings::MdSettingsUI::RegisterProfilePrefs(registry);
617 #endif 619 #endif
618 620
619 // Preferences registered only for migration (clearing or moving to a new key) 621 // Preferences registered only for migration (clearing or moving to a new key)
620 // go here. 622 // go here.
621 623
622 #if BUILDFLAG(ENABLE_GOOGLE_NOW) 624 #if BUILDFLAG(ENABLE_GOOGLE_NOW)
623 registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false); 625 registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false);
624 #endif 626 #endif
625 627
626 registry->RegisterBooleanPref(kCheckDefaultBrowser, true); 628 registry->RegisterBooleanPref(kCheckDefaultBrowser, true);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 729 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
728 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 730 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
729 731
730 #if BUILDFLAG(ENABLE_EXTENSIONS) 732 #if BUILDFLAG(ENABLE_EXTENSIONS)
731 // Added 2/2017. 733 // Added 2/2017.
732 profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus); 734 profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus);
733 #endif 735 #endif
734 } 736 }
735 737
736 } // namespace chrome 738 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698