Revert "[NTP] Separate internal custom link updates from user changes"
This reverts commit adf056599a25e3d59d1272de431aae24b549f927.
Reason for revert: Removing the HEAD request. See https://crbug/874194.
Original change's description:
> [NTP] Separate internal custom link updates from user changes
>
> When a default URL scheme is updated after URL validation, it is counted
> as a user action. This causes "Undo" to revert the URL scheme update
> instead of the user's add/update action.
>
> Add an additional parameter to CustomLinksManager::UpdateLink in order
> to distinguish between internal and user changes. Internal changes will
> not update the previous state that is restored when
> CustomLinksManager::UndoAction is called.
>
> Bug: 896143
> Change-Id: I643679fab5e546fac7e41214af6ff8a4ba9c8b53
> Reviewed-on: https://chromium-review.googlesource.com/c/1287259
> Commit-Queue: Kristi Park <[email protected]>
> Reviewed-by: Marc Treib <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#600988}
[email protected],[email protected]
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 896143
Change-Id: I26fd1f3a92161fe06009681ff90b5ea65c2db2b7
Reviewed-on: https://chromium-review.googlesource.com/c/1298553
Reviewed-by: Kristi Park <[email protected]>
Commit-Queue: Kristi Park <[email protected]>
Cr-Commit-Position: refs/heads/master@{#602536}diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/most_visited_sites.cc
index 77ccd0d2..1e1057bb 100644
--- a/components/ntp_tiles/most_visited_sites.cc
+++ b/components/ntp_tiles/most_visited_sites.cc
@@ -299,19 +299,16 @@
bool MostVisitedSites::UpdateCustomLink(const GURL& url,
const GURL& new_url,
- const base::string16& new_title,
- bool is_user_action) {
+ const base::string16& new_title) {
if (!custom_links_ || !custom_links_enabled_)
return false;
// Initialize custom links if they have not been initialized yet.
InitializeCustomLinks();
- bool success =
- custom_links_->UpdateLink(url, new_url, new_title, is_user_action);
+ bool success = custom_links_->UpdateLink(url, new_url, new_title);
if (success) {
- // Only update the action count if this was executed by the user.
- if (is_user_action && custom_links_action_count_ != -1)
+ if (custom_links_action_count_ != -1)
custom_links_action_count_++;
BuildCurrentTiles();
}
