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

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

Issue 2560783002: [NTP::PhysicalWeb] Implement suggestion dismissal. (Closed)
Patch Set: bauerb@ comment. Created 4 years 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" 157 #include "chrome/browser/android/ntp/new_tab_page_prefs.h"
158 #include "components/ntp_tiles/most_visited_sites.h" 158 #include "components/ntp_tiles/most_visited_sites.h"
159 #include "components/ntp_tiles/popular_sites.h" 159 #include "components/ntp_tiles/popular_sites.h"
160 #else 160 #else
161 #include "chrome/browser/ui/startup/startup_browser_creator.h" 161 #include "chrome/browser/ui/startup/startup_browser_creator.h"
162 #include "chrome/browser/upgrade_detector.h" 162 #include "chrome/browser/upgrade_detector.h"
163 #endif 163 #endif
164 164
165 #if defined(OS_ANDROID) 165 #if defined(OS_ANDROID)
166 #include "chrome/browser/android/preferences/browser_prefs_android.h" 166 #include "chrome/browser/android/preferences/browser_prefs_android.h"
167 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h"
168 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h"
169 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h"
167 #else 170 #else
168 #include "chrome/browser/services/gcm/gcm_product_util.h" 171 #include "chrome/browser/services/gcm/gcm_product_util.h"
169 #include "chrome/browser/signin/signin_promo.h" 172 #include "chrome/browser/signin/signin_promo.h"
170 #include "chrome/browser/ui/webui/foreign_session_handler.h" 173 #include "chrome/browser/ui/webui/foreign_session_handler.h"
171 #endif 174 #endif
172 175
173 #if defined(OS_CHROMEOS) 176 #if defined(OS_CHROMEOS)
174 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h" 177 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
175 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 178 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
176 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 179 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 #endif 544 #endif
542 545
543 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) 546 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
544 printing::StickySettings::RegisterProfilePrefs(registry); 547 printing::StickySettings::RegisterProfilePrefs(registry);
545 #endif 548 #endif
546 549
547 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 550 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
548 LocalDiscoveryUI::RegisterProfilePrefs(registry); 551 LocalDiscoveryUI::RegisterProfilePrefs(registry);
549 #endif 552 #endif
550 553
554 #if defined(OS_ANDROID)
Bernhard Bauer 2016/12/09 14:33:07 Can you move this block to line 595? I think it's
vitaliii 2016/12/09 16:13:48 Done.
555 DownloadSuggestionsProvider::RegisterProfilePrefs(registry);
556 ntp_snippets::PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs(
557 registry);
558 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry);
559 #endif // defined(OS_ANDROID)
560
551 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) 561 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
552 #if !defined(OS_ANDROID) 562 #if !defined(OS_ANDROID)
553 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); 563 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
554 SupervisedUserSyncService::RegisterProfilePrefs(registry); 564 SupervisedUserSyncService::RegisterProfilePrefs(registry);
555 #endif 565 #endif
556 ChildAccountService::RegisterProfilePrefs(registry); 566 ChildAccountService::RegisterProfilePrefs(registry);
557 SupervisedUserService::RegisterProfilePrefs(registry); 567 SupervisedUserService::RegisterProfilePrefs(registry);
558 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); 568 SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
559 #endif 569 #endif
560 570
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 // Added 8/2016. 790 // Added 8/2016.
781 profile_prefs->ClearPref(kStaticEncodings); 791 profile_prefs->ClearPref(kStaticEncodings);
782 profile_prefs->ClearPref(kRecentlySelectedEncoding); 792 profile_prefs->ClearPref(kRecentlySelectedEncoding);
783 793
784 // Added 9/2016. 794 // Added 9/2016.
785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 795 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 796 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
787 } 797 }
788 798
789 } // namespace chrome 799 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698