Commit 5dbb5b88 authored by Marc Treib's avatar Marc Treib Committed by Commit Bot

Remove feature CaptureThumbnailOnLoadFinished

and its implementation. This was abandoned in favor of
CaptureThumbnailBeforeNavigatingAway.

Bug: 765588
Change-Id: I1a587f809d6d25d446157731601c0a03d625dc69
Reviewed-on: https://chromium-review.googlesource.com/672525Reviewed-by: default avatarFriedrich Horschig <fhorschig@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503503}
parent 026a0195
...@@ -3216,11 +3216,6 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -3216,11 +3216,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kUseSuggestionsEvenIfFewFeatureDescription, kOsAll, flag_descriptions::kUseSuggestionsEvenIfFewFeatureDescription, kOsAll,
FEATURE_VALUE_TYPE(suggestions::kUseSuggestionsEvenIfFewFeature)}, FEATURE_VALUE_TYPE(suggestions::kUseSuggestionsEvenIfFewFeature)},
{"capture-thumbnail-on-load-finished",
flag_descriptions::kCaptureThumbnailOnLoadFinishedName,
flag_descriptions::kCaptureThumbnailOnLoadFinishedDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kCaptureThumbnailOnLoadFinished)},
{"use-new-accept-language-header", {"use-new-accept-language-header",
flag_descriptions::kUseNewAcceptLanguageHeaderName, flag_descriptions::kUseNewAcceptLanguageHeaderName,
flag_descriptions::kUseNewAcceptLanguageHeaderDescription, kOsAll, flag_descriptions::kUseNewAcceptLanguageHeaderDescription, kOsAll,
......
...@@ -84,12 +84,6 @@ const char kBypassAppBannerEngagementChecksDescription[] = ...@@ -84,12 +84,6 @@ const char kBypassAppBannerEngagementChecksDescription[] =
"eligibility requirements for showing app banners, such as having a " "eligibility requirements for showing app banners, such as having a "
"manifest, are met."; "manifest, are met.";
const char kCaptureThumbnailOnLoadFinishedName[] =
"Capture page thumbnail on load finished";
const char kCaptureThumbnailOnLoadFinishedDescription[] =
"Capture a page thumbnail (for use on the New Tab page) when the page load "
"finishes, in addition to other times a thumbnail may be captured.";
const char kCaptureThumbnailOnNavigatingAwayName[] = const char kCaptureThumbnailOnNavigatingAwayName[] =
"Capture page thumbnail on navigating away"; "Capture page thumbnail on navigating away";
const char kCaptureThumbnailOnNavigatingAwayDescription[] = const char kCaptureThumbnailOnNavigatingAwayDescription[] =
......
...@@ -78,9 +78,6 @@ extern const char kBrowserTaskSchedulerDescription[]; ...@@ -78,9 +78,6 @@ extern const char kBrowserTaskSchedulerDescription[];
extern const char kBypassAppBannerEngagementChecksName[]; extern const char kBypassAppBannerEngagementChecksName[];
extern const char kBypassAppBannerEngagementChecksDescription[]; extern const char kBypassAppBannerEngagementChecksDescription[];
extern const char kCaptureThumbnailOnLoadFinishedName[];
extern const char kCaptureThumbnailOnLoadFinishedDescription[];
extern const char kCaptureThumbnailOnNavigatingAwayName[]; extern const char kCaptureThumbnailOnNavigatingAwayName[];
extern const char kCaptureThumbnailOnNavigatingAwayDescription[]; extern const char kCaptureThumbnailOnNavigatingAwayDescription[];
......
...@@ -62,15 +62,11 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(ThumbnailTabHelper); ...@@ -62,15 +62,11 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(ThumbnailTabHelper);
// There are several triggers that can start the process: // There are several triggers that can start the process:
// - When a renderer is about to be hidden (this usually occurs when the current // - When a renderer is about to be hidden (this usually occurs when the current
// tab is closed or another tab is clicked). // tab is closed or another tab is clicked).
// - If features::kCaptureThumbnailOnLoadFinished is enabled: When a page load
// finishes.
// - If features::kCaptureThumbnailOnNavigatingAway is enabled: Just before // - If features::kCaptureThumbnailOnNavigatingAway is enabled: Just before
// navigating away from the current page. // navigating away from the current page.
ThumbnailTabHelper::ThumbnailTabHelper(content::WebContents* contents) ThumbnailTabHelper::ThumbnailTabHelper(content::WebContents* contents)
: content::WebContentsObserver(contents), : content::WebContentsObserver(contents),
capture_on_load_finished_(base::FeatureList::IsEnabled(
features::kCaptureThumbnailOnLoadFinished)),
capture_on_navigating_away_(base::FeatureList::IsEnabled( capture_on_navigating_away_(base::FeatureList::IsEnabled(
features::kCaptureThumbnailOnNavigatingAway)), features::kCaptureThumbnailOnNavigatingAway)),
page_transition_(ui::PAGE_TRANSITION_LINK), page_transition_(ui::PAGE_TRANSITION_LINK),
...@@ -154,12 +150,6 @@ void ThumbnailTabHelper::DidStartLoading() { ...@@ -154,12 +150,6 @@ void ThumbnailTabHelper::DidStartLoading() {
load_interrupted_ = false; load_interrupted_ = false;
} }
void ThumbnailTabHelper::DidStopLoading() {
if (capture_on_load_finished_) {
UpdateThumbnailIfNecessary();
}
}
void ThumbnailTabHelper::NavigationStopped() { void ThumbnailTabHelper::NavigationStopped() {
// This function gets called when the page loading is interrupted by the // This function gets called when the page loading is interrupted by the
// stop button. // stop button.
......
...@@ -45,7 +45,6 @@ class ThumbnailTabHelper ...@@ -45,7 +45,6 @@ class ThumbnailTabHelper
void DidFinishNavigation( void DidFinishNavigation(
content::NavigationHandle* navigation_handle) override; content::NavigationHandle* navigation_handle) override;
void DidStartLoading() override; void DidStartLoading() override;
void DidStopLoading() override;
void NavigationStopped() override; void NavigationStopped() override;
// Update the thumbnail of the given tab contents if necessary. // Update the thumbnail of the given tab contents if necessary.
...@@ -72,7 +71,6 @@ class ThumbnailTabHelper ...@@ -72,7 +71,6 @@ class ThumbnailTabHelper
// Indicates that the given widget has changed is visibility. // Indicates that the given widget has changed is visibility.
void WidgetHidden(content::RenderWidgetHost* widget); void WidgetHidden(content::RenderWidgetHost* widget);
const bool capture_on_load_finished_;
const bool capture_on_navigating_away_; const bool capture_on_navigating_away_;
content::NotificationRegistrar registrar_; content::NotificationRegistrar registrar_;
......
...@@ -124,11 +124,6 @@ const base::Feature kCaptureThumbnailDependingOnTransitionType{ ...@@ -124,11 +124,6 @@ const base::Feature kCaptureThumbnailDependingOnTransitionType{
"CaptureThumbnailDependingOnTransitionType", "CaptureThumbnailDependingOnTransitionType",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
// Whether to capture page thumbnails when the page load finishes (in addition
// to any other times this might happen).
const base::Feature kCaptureThumbnailOnLoadFinished{
"CaptureThumbnailOnLoadFinished", base::FEATURE_DISABLED_BY_DEFAULT};
// Whether to capture page thumbnails when navigating away from the current page // Whether to capture page thumbnails when navigating away from the current page
// (in addition to any other times this might happen). // (in addition to any other times this might happen).
const base::Feature kCaptureThumbnailOnNavigatingAway{ const base::Feature kCaptureThumbnailOnNavigatingAway{
......
...@@ -65,8 +65,6 @@ extern const base::Feature kTabStripKeyboardFocus; ...@@ -65,8 +65,6 @@ extern const base::Feature kTabStripKeyboardFocus;
extern const base::Feature kCaptureThumbnailDependingOnTransitionType; extern const base::Feature kCaptureThumbnailDependingOnTransitionType;
extern const base::Feature kCaptureThumbnailOnLoadFinished;
extern const base::Feature kCaptureThumbnailOnNavigatingAway; extern const base::Feature kCaptureThumbnailOnNavigatingAway;
extern const base::Feature kCheckInstallabilityForBannerOnLoad; extern const base::Feature kCheckInstallabilityForBannerOnLoad;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment