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

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

Issue 2354193002: Revert "MD History: promote menu button to show clear browsing data in narrow mode" (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/md_downloads/crisper.js » ('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 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 #endif 234 #endif
235 235
236 #if defined(TOOLKIT_VIEWS) 236 #if defined(TOOLKIT_VIEWS)
237 #include "chrome/browser/ui/browser_view_prefs.h" 237 #include "chrome/browser/ui/browser_view_prefs.h"
238 #endif 238 #endif
239 239
240 #if defined(USE_ASH) 240 #if defined(USE_ASH)
241 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 241 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
242 #endif 242 #endif
243 243
244 #if !defined(OS_ANDROID) && !defined(OS_IOS)
245 #include "chrome/browser/ui/webui/md_history_ui.cc"
246 #endif
247
248 namespace { 244 namespace {
249 245
250 #if defined(OS_WIN) 246 #if defined(OS_WIN)
251 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. 247 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+.
252 const char kShownAutoLaunchInfobarDeprecated[] = 248 const char kShownAutoLaunchInfobarDeprecated[] =
253 "browser.shown_autolaunch_infobar"; 249 "browser.shown_autolaunch_infobar";
254 #endif // defined(OS_WIN) 250 #endif // defined(OS_WIN)
255 251
256 // The SessionStartupPref used this pref to store the list of URLs to restore 252 // The SessionStartupPref used this pref to store the list of URLs to restore
257 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration 253 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 613
618 #if defined(TOOLKIT_VIEWS) 614 #if defined(TOOLKIT_VIEWS)
619 RegisterBrowserViewProfilePrefs(registry); 615 RegisterBrowserViewProfilePrefs(registry);
620 RegisterInvertBubbleUserPrefs(registry); 616 RegisterInvertBubbleUserPrefs(registry);
621 #endif 617 #endif
622 618
623 #if defined(USE_ASH) 619 #if defined(USE_ASH)
624 ash::launcher::RegisterChromeLauncherUserPrefs(registry); 620 ash::launcher::RegisterChromeLauncherUserPrefs(registry);
625 #endif 621 #endif
626 622
627 #if !defined(OS_ANDROID) && !defined(OS_IOS)
628 MdHistoryUI::RegisterProfilePrefs(registry);
629 #endif
630
631 // Preferences registered only for migration (clearing or moving to a new key) 623 // Preferences registered only for migration (clearing or moving to a new key)
632 // go here. 624 // go here.
633 625
634 #if defined(OS_WIN) 626 #if defined(OS_WIN)
635 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); 627 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0);
636 #endif // defined(OS_WIN) 628 #endif // defined(OS_WIN)
637 629
638 #if defined(USE_AURA) 630 #if defined(USE_AURA)
639 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0); 631 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0);
640 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0); 632 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Added 8/2016. 767 // Added 8/2016.
776 profile_prefs->ClearPref(kStaticEncodings); 768 profile_prefs->ClearPref(kStaticEncodings);
777 profile_prefs->ClearPref(kRecentlySelectedEncoding); 769 profile_prefs->ClearPref(kRecentlySelectedEncoding);
778 770
779 // Added 9/2016. 771 // Added 9/2016.
780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 772 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 773 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
782 } 774 }
783 775
784 } // namespace chrome 776 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/md_downloads/crisper.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698