| commit | ec90a246674fff41ce6f950cf24c7a44a7ed4573 | [log] [tgz] |
|---|---|---|
| author | Moe Ahmadi <[email protected]> | Thu Oct 29 18:54:13 2020 |
| committer | Commit Bot <[email protected]> | Thu Oct 29 18:54:13 2020 |
| tree | e8672919d11bf03150961944f2b64a29757fc9a6 | |
| parent | 318a781f7fb0186b0ab17bb3c8dd938ede98c383 [diff] [blame] |
Reland "[NTP][RQ] Moves ntp_features.* from c/b/search to components/search" This reverts commit 6cc853a2fed59b77229fa5f34e870d23fa29b466. Reason for revert: kaleidoscope/internal/ changes will land in https://chrome-internal-review.googlesource.com/c/chrome/browser/media/kaleidoscope/internal/+/3366986 PLEASE DO NOT REVERT Original change's description: > Revert "[NTP][RQ] Moves ntp_features.* from c/b/search to components/search" > > This reverts commit 9de8d0a88e26f2783abf0f6bc98d5232ff3a2aaf. > > Reason for revert: Causes compile error on win-chrome builders > > See e.g.: > https://ci.chromium.org/p/chrome/builders/ci/win-chrome/16430 > > Original change's description: > > [NTP][RQ] Moves ntp_features.* from c/b/search to components/search > > > > Allows using NTP features in MostVisitedSites and related services in > > components/ > > > > Fixed: 1143475 > > > > Change-Id: I673bed5c25651acca3ef7c44512567599bb6b9f5 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2504639 > > Commit-Queue: Moe Ahmadi <[email protected]> > > Auto-Submit: Moe Ahmadi <[email protected]> > > Reviewed-by: Alex Gough <[email protected]> > > Reviewed-by: Scott Violet <[email protected]> > > Cr-Commit-Position: refs/heads/master@{#821986} > > [email protected],[email protected],[email protected] > > Change-Id: I9abc3b7addd2a1f6e5c0d3abfc721acbb86fa3e1 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2507070 > Reviewed-by: Rune Lillesveen <[email protected]> > Commit-Queue: Rune Lillesveen <[email protected]> > Cr-Commit-Position: refs/heads/master@{#822088} [email protected],[email protected],[email protected],[email protected] Change-Id: Ica9beab6f812d907a6ee5ee87bd9896ba3132ed7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2507989 Reviewed-by: Moe Ahmadi <[email protected]> Reviewed-by: Alex Gough <[email protected]> Commit-Queue: Moe Ahmadi <[email protected]> Cr-Commit-Position: refs/heads/master@{#822291}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 944d5b901..8d180a60 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -47,7 +47,6 @@ #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.h" #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.h" #include "chrome/browser/resource_coordinator/tab_manager_features.h" -#include "chrome/browser/search/ntp_features.h" #include "chrome/browser/sharing/click_to_call/feature.h" #include "chrome/browser/sharing/features.h" #include "chrome/browser/sharing/shared_clipboard/feature_flags.h" @@ -113,6 +112,7 @@ #include "components/query_tiles/switches.h" #include "components/reading_list/features/reading_list_switches.h" #include "components/safe_browsing/core/features.h" +#include "components/search/ntp_features.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" #include "components/security_interstitials/core/features.h" #include "components/security_state/core/features.h"