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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchIconSpriteControl.java

Issue 2322793002: [Contextual Search] Fetch and display thumbnails returned in resolution response (Closed)
Patch Set: std::unique_ptr Created 4 years, 3 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchIconSpriteControl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchIconSpriteControl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchIconSpriteControl.java
index 4d16a38f953f522ab3b0719dc5e94dbd965dbd99..94685d053503f94a526f685d1a8a592f32caaaf3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchIconSpriteControl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchIconSpriteControl.java
@@ -33,11 +33,6 @@ public class ContextualSearchIconSpriteControl implements
private boolean mShouldAnimateAppearance;
/**
- * Whether the appearance of the search provider icon sprite is disabled by a field trial.
- */
- private boolean mIsAnimationDisabledByTrial;
-
- /**
* The completion percentage for the animation; used to calculate which sprite frame to display.
*/
private float mCompletionPercentage;
@@ -88,12 +83,9 @@ public class ContextualSearchIconSpriteControl implements
/**
* @param shouldAnimateAppearance Whether the appearance of the search provider icon sprite
* should be animated.
- * @param isAnimationDisabledByTrial Whether animating the search provider icon is disabled by a
- * field trial.
*/
- public void setShouldAnimateAppearance(boolean shouldAnimateAppearance,
- boolean isAnimationDisabledByTrial) {
- if (shouldAnimateAppearance && !isAnimationDisabledByTrial) {
+ public void setShouldAnimateAppearance(boolean shouldAnimateAppearance) {
+ if (shouldAnimateAppearance) {
// The search provider icon sprite should be hidden until the animation starts.
mIsVisible = false;
mCompletionPercentage = 0.f;
@@ -102,7 +94,6 @@ public class ContextualSearchIconSpriteControl implements
mCompletionPercentage = 1.f;
}
mShouldAnimateAppearance = shouldAnimateAppearance;
- mIsAnimationDisabledByTrial = isAnimationDisabledByTrial;
}
// ============================================================================================
@@ -116,12 +107,8 @@ public class ContextualSearchIconSpriteControl implements
public void animateApperance() {
// The search provider icon sprite should be visible once the animation starts.
mIsVisible = true;
- if (!mIsAnimationDisabledByTrial) {
- mPanel.addToAnimation(this, AnimationType.APPEARANCE, 0.f, 1.f,
- OverlayPanelAnimation.MAXIMUM_ANIMATION_DURATION_MS, 0);
- } else {
- mCompletionPercentage = 1.f;
- }
+ mPanel.addToAnimation(this, AnimationType.APPEARANCE, 0.f, 1.f,
+ OverlayPanelAnimation.MAXIMUM_ANIMATION_DURATION_MS, 0);
}
@Override

Powered by Google App Engine
This is Rietveld 408576698