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

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

Issue 2280513002: MD History: promote menu button to show clear browsing data in narrow mode (Closed)
Patch Set: !showingSearch_ Created 4 years, 3 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 #endif 232 #endif
233 233
234 #if defined(TOOLKIT_VIEWS) 234 #if defined(TOOLKIT_VIEWS)
235 #include "chrome/browser/ui/browser_view_prefs.h" 235 #include "chrome/browser/ui/browser_view_prefs.h"
236 #endif 236 #endif
237 237
238 #if defined(USE_ASH) 238 #if defined(USE_ASH)
239 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 239 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
240 #endif 240 #endif
241 241
242 #if !defined(OS_ANDROID) && !defined(OS_IOS)
243 #include "chrome/browser/ui/webui/md_history_ui.cc"
244 #endif
245
242 namespace { 246 namespace {
243 247
244 #if defined(OS_WIN) 248 #if defined(OS_WIN)
245 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. 249 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+.
246 const char kShownAutoLaunchInfobarDeprecated[] = 250 const char kShownAutoLaunchInfobarDeprecated[] =
247 "browser.shown_autolaunch_infobar"; 251 "browser.shown_autolaunch_infobar";
248 #endif // defined(OS_WIN) 252 #endif // defined(OS_WIN)
249 253
250 // The SessionStartupPref used this pref to store the list of URLs to restore 254 // The SessionStartupPref used this pref to store the list of URLs to restore
251 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration 255 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 610
607 #if defined(TOOLKIT_VIEWS) 611 #if defined(TOOLKIT_VIEWS)
608 RegisterBrowserViewProfilePrefs(registry); 612 RegisterBrowserViewProfilePrefs(registry);
609 RegisterInvertBubbleUserPrefs(registry); 613 RegisterInvertBubbleUserPrefs(registry);
610 #endif 614 #endif
611 615
612 #if defined(USE_ASH) 616 #if defined(USE_ASH)
613 ash::launcher::RegisterChromeLauncherUserPrefs(registry); 617 ash::launcher::RegisterChromeLauncherUserPrefs(registry);
614 #endif 618 #endif
615 619
620 #if !defined(OS_ANDROID) && !defined(OS_IOS)
621 MdHistoryUI::RegisterProfilePrefs(registry);
622 #endif
623
616 // Preferences registered only for migration (clearing or moving to a new key) 624 // Preferences registered only for migration (clearing or moving to a new key)
617 // go here. 625 // go here.
618 626
619 #if defined(OS_WIN) 627 #if defined(OS_WIN)
620 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); 628 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0);
621 #endif // defined(OS_WIN) 629 #endif // defined(OS_WIN)
622 630
623 #if defined(USE_AURA) 631 #if defined(USE_AURA)
624 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0); 632 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0);
625 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0); 633 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0);
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 765
758 // Added 8/2016. 766 // Added 8/2016.
759 profile_prefs->ClearPref(kStaticEncodings); 767 profile_prefs->ClearPref(kStaticEncodings);
760 profile_prefs->ClearPref(kRecentlySelectedEncoding); 768 profile_prefs->ClearPref(kRecentlySelectedEncoding);
761 769
762 // Added 9/2016. 770 // Added 9/2016.
763 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 771 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
764 } 772 }
765 773
766 } // namespace chrome 774 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/md_downloads/crisper.js » ('j') | chrome/browser/ui/webui/md_history_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698