Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
index 98abce0ec11c028443fb8be811b810dac2f87df2..735bd85ab7e4070519c5c0a298265b87cf098652 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.ntp.NewTabPage.OnSearchBoxScrollListener; |
import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver; |
import org.chromium.chrome.browser.profiles.MostVisitedSites.ThumbnailCallback; |
import org.chromium.chrome.browser.util.ViewUtils; |
+import org.chromium.chrome.browser.widget.LoadingView; |
import org.chromium.chrome.browser.widget.RoundedIconGenerator; |
import org.chromium.ui.text.SpanApplier; |
import org.chromium.ui.text.SpanApplier.SpanInfo; |
@@ -85,6 +86,7 @@ public class NewTabPageView extends FrameLayout |
private ViewGroup mContentView; |
private NewTabScrollView mScrollView; |
+ private LoadingView mLoadingView; |
private LogoView mSearchProviderLogoView; |
private View mSearchBoxView; |
private TextView mSearchBoxTextView; |
@@ -261,6 +263,7 @@ public class NewTabPageView extends FrameLayout |
mMostVisitedLayout = (ViewGroup) mostVisitedLayoutStub.inflate(); |
mMostVisitedDesign.initMostVisitedLayout(mMostVisitedLayout, searchProviderHasLogo); |
+ mLoadingView = (LoadingView) findViewById(R.id.loading_view); |
mSearchProviderLogoView = (LogoView) findViewById(R.id.search_provider_logo); |
mSearchBoxView = findViewById(R.id.search_box); |
mNoSearchLogoSpacer = findViewById(R.id.no_search_logo_spacer); |
@@ -524,10 +527,16 @@ public class NewTabPageView extends FrameLayout |
if (!disable) setUrlFocusChangeAnimationPercent(mUrlFocusChangePercent); |
} |
+ void setAnimatedLogoLoading(boolean isLoading) { |
+ if (isLoading) mLoadingView.showLoadingUI(); |
+ else mLoadingView.hideLoadingUI(); |
+ } |
+ |
/** |
* Starts playing the given animated GIF logo. |
*/ |
void playAnimatedLogo(BaseGifImage gifImage) { |
+ setAnimatedLogoLoading(false); |
mSearchProviderLogoView.playAnimatedLogo(gifImage); |
} |