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

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: asdf Created 4 years, 4 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 #endif 233 #endif
234 234
235 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 235 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
236 #include "chrome/browser/ui/startup/default_browser_prompt.h" 236 #include "chrome/browser/ui/startup/default_browser_prompt.h"
237 #endif 237 #endif
238 238
239 #if defined(ENABLE_APP_LIST) 239 #if defined(ENABLE_APP_LIST)
240 #include "chrome/browser/apps/drive/drive_app_mapping.h" 240 #include "chrome/browser/apps/drive/drive_app_mapping.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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 601
598 #if defined(TOOLKIT_VIEWS) 602 #if defined(TOOLKIT_VIEWS)
599 RegisterBrowserViewProfilePrefs(registry); 603 RegisterBrowserViewProfilePrefs(registry);
600 RegisterInvertBubbleUserPrefs(registry); 604 RegisterInvertBubbleUserPrefs(registry);
601 #endif 605 #endif
602 606
603 #if defined(USE_ASH) 607 #if defined(USE_ASH)
604 ash::launcher::RegisterChromeLauncherUserPrefs(registry); 608 ash::launcher::RegisterChromeLauncherUserPrefs(registry);
605 #endif 609 #endif
606 610
611 #if !defined(OS_ANDROID) && !defined(OS_IOS)
612 MdHistoryUI::RegisterProfilePrefs(registry);
613 #endif
614
607 // Preferences registered only for migration (clearing or moving to a new key) 615 // Preferences registered only for migration (clearing or moving to a new key)
608 // go here. 616 // go here.
609 617
610 #if defined(OS_WIN) 618 #if defined(OS_WIN)
611 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); 619 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0);
612 #endif // defined(OS_WIN) 620 #endif // defined(OS_WIN)
613 621
614 #if defined(USE_AURA) 622 #if defined(USE_AURA)
615 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0); 623 registry->RegisterIntegerPref(kFlingMaxCancelToDownTimeInMs, 0);
616 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0); 624 registry->RegisterIntegerPref(kFlingMaxTapGapTimeInMs, 0);
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 // Added 5/2016. 746 // Added 5/2016.
739 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); 747 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
740 748
741 // Added 7/2016. 749 // Added 7/2016.
742 DeleteWebRTCIdentityStoreDB(profile); 750 DeleteWebRTCIdentityStoreDB(profile);
743 profile_prefs->ClearPref(kNetworkPredictionEnabled); 751 profile_prefs->ClearPref(kNetworkPredictionEnabled);
744 profile_prefs->ClearPref(kDisableSpdy); 752 profile_prefs->ClearPref(kDisableSpdy);
745 } 753 }
746 754
747 } // namespace chrome 755 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698