| OLD | NEW |
| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 #endif | 233 #endif |
| 234 | 234 |
| 235 #if defined(TOOLKIT_VIEWS) | 235 #if defined(TOOLKIT_VIEWS) |
| 236 #include "chrome/browser/ui/browser_view_prefs.h" | 236 #include "chrome/browser/ui/browser_view_prefs.h" |
| 237 #endif | 237 #endif |
| 238 | 238 |
| 239 #if defined(USE_ASH) | 239 #if defined(USE_ASH) |
| 240 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 240 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| 241 #endif | 241 #endif |
| 242 | 242 |
| 243 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 244 #include "chrome/browser/ui/webui/md_history_ui.cc" |
| 245 #endif |
| 246 |
| 243 namespace { | 247 namespace { |
| 244 | 248 |
| 245 #if defined(OS_WIN) | 249 #if defined(OS_WIN) |
| 246 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. | 250 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. |
| 247 const char kShownAutoLaunchInfobarDeprecated[] = | 251 const char kShownAutoLaunchInfobarDeprecated[] = |
| 248 "browser.shown_autolaunch_infobar"; | 252 "browser.shown_autolaunch_infobar"; |
| 249 #endif // defined(OS_WIN) | 253 #endif // defined(OS_WIN) |
| 250 | 254 |
| 251 // The SessionStartupPref used this pref to store the list of URLs to restore | 255 // The SessionStartupPref used this pref to store the list of URLs to restore |
| 252 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration | 256 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 | 614 |
| 611 #if defined(TOOLKIT_VIEWS) | 615 #if defined(TOOLKIT_VIEWS) |
| 612 RegisterBrowserViewProfilePrefs(registry); | 616 RegisterBrowserViewProfilePrefs(registry); |
| 613 RegisterInvertBubbleUserPrefs(registry); | 617 RegisterInvertBubbleUserPrefs(registry); |
| 614 #endif | 618 #endif |
| 615 | 619 |
| 616 #if defined(USE_ASH) | 620 #if defined(USE_ASH) |
| 617 ash::launcher::RegisterChromeLauncherUserPrefs(registry); | 621 ash::launcher::RegisterChromeLauncherUserPrefs(registry); |
| 618 #endif | 622 #endif |
| 619 | 623 |
| 624 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 625 MdHistoryUI::RegisterProfilePrefs(registry); |
| 626 #endif |
| 627 |
| 620 // Preferences registered only for migration (clearing or moving to a new key) | 628 // Preferences registered only for migration (clearing or moving to a new key) |
| 621 // go here. | 629 // go here. |
| 622 | 630 |
| 623 #if defined(OS_WIN) | 631 #if defined(OS_WIN) |
| 624 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); | 632 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); |
| 625 #endif // defined(OS_WIN) | 633 #endif // defined(OS_WIN) |
| 626 | 634 |
| 627 #if defined(USE_AURA) | 635 #if defined(USE_AURA) |
| 628 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0); | 636 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0); |
| 629 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0); | 637 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0); |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 // Added 8/2016. | 772 // Added 8/2016. |
| 765 profile_prefs->ClearPref(kStaticEncodings); | 773 profile_prefs->ClearPref(kStaticEncodings); |
| 766 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 774 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 767 | 775 |
| 768 // Added 9/2016. | 776 // Added 9/2016. |
| 769 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 777 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 770 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 778 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 771 } | 779 } |
| 772 | 780 |
| 773 } // namespace chrome | 781 } // namespace chrome |
| OLD | NEW |