0008-restore-classic-ntp.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. --- a/chrome/browser/search/search.cc
  2. +++ b/chrome/browser/search/search.cc
  3. @@ -176,26 +176,7 @@ struct NewTabURLDetails {
  4. const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
  5. - if (ShouldShowLocalNewTab(profile))
  6. - return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
  7. -
  8. - const TemplateURL* template_url =
  9. - GetDefaultSearchProviderTemplateURL(profile);
  10. - if (!profile || !template_url)
  11. - return NewTabURLDetails(local_url, NEW_TAB_URL_BAD);
  12. -
  13. - GURL search_provider_url(template_url->new_tab_url_ref().ReplaceSearchTerms(
  14. - TemplateURLRef::SearchTermsArgs(base::string16()),
  15. - UIThreadSearchTermsData(profile)));
  16. -
  17. - if (!search_provider_url.is_valid())
  18. - return NewTabURLDetails(local_url, NEW_TAB_URL_NOT_SET);
  19. - if (!search_provider_url.SchemeIsCryptographic())
  20. - return NewTabURLDetails(local_url, NEW_TAB_URL_INSECURE);
  21. - if (!IsURLAllowedForSupervisedUser(search_provider_url, profile))
  22. - return NewTabURLDetails(local_url, NEW_TAB_URL_BLOCKED);
  23. -
  24. - return NewTabURLDetails(search_provider_url, NEW_TAB_URL_VALID);
  25. + return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
  26. }
  27. const GURL url;
  28. --- a/components/ntp_snippets/features.cc
  29. +++ b/components/ntp_snippets/features.cc
  30. @@ -39,7 +39,7 @@ const base::Feature* const kAllFeatures[
  31. &kOptionalImagesEnabledFeature};
  32. const base::Feature kArticleSuggestionsFeature{
  33. - "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
  34. + "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
  35. const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
  36. "RemoteSuggestionsEmulateM58FetchingSchedule",
  37. @@ -69,7 +69,7 @@ const char kNotificationsDailyLimit[] =
  38. const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
  39. const base::Feature kKeepPrefetchedContentSuggestions{
  40. - "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
  41. + "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
  42. const base::Feature kOptionalImagesEnabledFeature{
  43. "NTPRemoteSuggestionsOptionalImages", base::FEATURE_DISABLED_BY_DEFAULT};