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

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

Issue 2236303002: Make OfflinePage ContentSuggestions dismissable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: base::Value --> std::unique_ptr<base::Value> 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 200 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
201 #include "chromeos/timezone/timezone_resolver.h" 201 #include "chromeos/timezone/timezone_resolver.h"
202 #include "components/invalidation/impl/invalidator_storage.h" 202 #include "components/invalidation/impl/invalidator_storage.h"
203 #include "components/quirks/quirks_manager.h" 203 #include "components/quirks/quirks_manager.h"
204 #else 204 #else
205 #include "chrome/browser/extensions/default_apps.h" 205 #include "chrome/browser/extensions/default_apps.h"
206 #endif 206 #endif
207 207
208 #if defined(OS_ANDROID) 208 #if defined(OS_ANDROID)
209 #include "chrome/browser/notifications/notification_platform_bridge_android.h" 209 #include "chrome/browser/notifications/notification_platform_bridge_android.h"
210 #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provide r.h"
210 #endif 211 #endif
211 212
212 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 213 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
213 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 214 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
214 #endif 215 #endif
215 216
216 #if defined(OS_MACOSX) 217 #if defined(OS_MACOSX)
217 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 218 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
218 #include "chrome/browser/ui/cocoa/confirm_quit.h" 219 #include "chrome/browser/ui/cocoa/confirm_quit.h"
219 #endif 220 #endif
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 PinnedTabCodec::RegisterProfilePrefs(registry); 556 PinnedTabCodec::RegisterProfilePrefs(registry);
556 signin::RegisterProfilePrefs(registry); 557 signin::RegisterProfilePrefs(registry);
557 #endif 558 #endif
558 559
559 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 560 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
560 default_apps::RegisterProfilePrefs(registry); 561 default_apps::RegisterProfilePrefs(registry);
561 #endif 562 #endif
562 563
563 #if defined(OS_ANDROID) 564 #if defined(OS_ANDROID)
564 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); 565 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry);
566 ntp_snippets::OfflinePageSuggestionsProvider::RegisterProfilePrefs(registry);
565 #endif 567 #endif
566 568
567 #if defined(OS_CHROMEOS) 569 #if defined(OS_CHROMEOS)
568 arc::ArcAuthService::RegisterProfilePrefs(registry); 570 arc::ArcAuthService::RegisterProfilePrefs(registry);
569 chromeos::first_run::RegisterProfilePrefs(registry); 571 chromeos::first_run::RegisterProfilePrefs(registry);
570 chromeos::file_system_provider::RegisterProfilePrefs(registry); 572 chromeos::file_system_provider::RegisterProfilePrefs(registry);
571 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 573 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
572 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 574 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
573 chromeos::PinStorage::RegisterProfilePrefs(registry); 575 chromeos::PinStorage::RegisterProfilePrefs(registry);
574 chromeos::Preferences::RegisterProfilePrefs(registry); 576 chromeos::Preferences::RegisterProfilePrefs(registry);
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 // Added 5/2016. 739 // Added 5/2016.
738 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); 740 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
739 741
740 // Added 7/2016. 742 // Added 7/2016.
741 DeleteWebRTCIdentityStoreDB(profile); 743 DeleteWebRTCIdentityStoreDB(profile);
742 profile_prefs->ClearPref(kNetworkPredictionEnabled); 744 profile_prefs->ClearPref(kNetworkPredictionEnabled);
743 profile_prefs->ClearPref(kDisableSpdy); 745 profile_prefs->ClearPref(kDisableSpdy);
744 } 746 }
745 747
746 } // namespace chrome 748 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698