[Android Refactor]: Use ChromeActivity in BasicNativePage constructor

The android.app.Activity passed to the BasicNativePage constructor is always a
ChromeActivity. This CL changes the type of the parameter to the
BasicNativePage constructor to ChromeActivity. This enables removing an
always-true "instanceof ChromeActivity" if() statement.

BUG=835294

Change-Id: I7e63c26ae1d1eb53aa7e5be71174310320c6b471
Reviewed-on: https://chromium-review.googlesource.com/1021993
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553918}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.feed;
 
-import android.app.Activity;
 import android.view.View;
 import android.widget.FrameLayout;
 
@@ -46,7 +45,7 @@ public class FeedNewTabPage extends BasicNativePage {
     }
 
     @Override
-    protected void initialize(Activity activity, NativePageHost host) {
+    protected void initialize(ChromeActivity activity, NativePageHost host) {
         mRootView = new FrameLayout(activity);
         mRootView.setLayoutParams(new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
@@ -69,4 +68,4 @@ public class FeedNewTabPage extends BasicNativePage {
     public String getHost() {
         return UrlConstants.NTP_HOST;
     }
-}
+}
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/BasicNativePage.java

@@ -31,11 +31,11 @@ public abstract class BasicNativePage extends EmptyTabObserver implements Native
 
     private String mUrl;
 
-    public BasicNativePage(Activity activity, NativePageHost host) {
+    public BasicNativePage(ChromeActivity activity, NativePageHost host) {
         this(activity, host, false);
     }
 
-    public BasicNativePage(Activity activity, NativePageHost host, boolean isIncognito) {
+    public BasicNativePage(ChromeActivity activity, NativePageHost host, boolean isIncognito) {
         initialize(activity, host);
         mActivity = activity;
         mHost = host;
@@ -49,11 +49,7 @@ public abstract class BasicNativePage extends EmptyTabObserver implements Native
         Resources res = mActivity.getResources();
 
         mTopMargin = 0;
-        mBottomMargin = 0;
-        if (activity instanceof ChromeActivity) {
-            mBottomMargin =
-                    ((ChromeActivity) activity).getFullscreenManager().getBottomControlsHeight();
-        }
+        mBottomMargin = activity.getFullscreenManager().getBottomControlsHeight();
         mTopMargin = res.getDimensionPixelSize(R.dimen.tab_strip_height)
                 + res.getDimensionPixelSize(R.dimen.toolbar_height_no_shadow);
 
@@ -69,7 +65,7 @@ public abstract class BasicNativePage extends EmptyTabObserver implements Native
     /**
      * Subclasses shall implement this method to initialize the UI that they hold.
      */
-    protected abstract void initialize(Activity activity, NativePageHost host);
+    protected abstract void initialize(ChromeActivity activity, NativePageHost host);
 
     @Override
     public void onBrowserControlsConstraintsUpdated(

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java

@@ -4,12 +4,12 @@
 
 package org.chromium.chrome.browser.bookmarks;
 
-import android.app.Activity;
 import android.view.View;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BasicNativePage;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.NativePageHost;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
@@ -26,12 +26,12 @@ public class BookmarkPage extends BasicNativePage {
      * @param activity The activity to get context and manage fragments.
      * @param host A NativePageHost to load urls.
      */
-    public BookmarkPage(Activity activity, NativePageHost host) {
+    public BookmarkPage(ChromeActivity activity, NativePageHost host) {
         super(activity, host);
     }
 
     @Override
-    protected void initialize(Activity activity, NativePageHost host) {
+    protected void initialize(ChromeActivity activity, NativePageHost host) {
         mManager = new BookmarkManager(
                 activity, false, ((SnackbarManageable) activity).getSnackbarManager());
         mManager.setBasicNativePage(this);

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadPage.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.download;
 
-import android.app.Activity;
 import android.view.View;
 
 import org.chromium.base.ActivityState;
@@ -13,6 +12,7 @@ import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BasicNativePage;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.NativePageHost;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.download.ui.DownloadManagerUi;
@@ -32,12 +32,12 @@ public class DownloadPage extends BasicNativePage {
      * @param activity The activity to get context and manage fragments.
      * @param host A NativePageHost to load urls.
      */
-    public DownloadPage(Activity activity, NativePageHost host) {
+    public DownloadPage(ChromeActivity activity, NativePageHost host) {
         super(activity, host);
     }
 
     @Override
-    protected void initialize(Activity activity, final NativePageHost host) {
+    protected void initialize(ChromeActivity activity, final NativePageHost host) {
         ThreadUtils.assertOnUiThread();
 
         mManager = new DownloadManagerUi(activity, host.isIncognito(), activity.getComponentName(),

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java

@@ -10,6 +10,7 @@ import android.view.View;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BasicNativePage;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.NativePageHost;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
@@ -30,7 +31,7 @@ public class HistoryPage extends BasicNativePage {
      *                 {@link HistoryManager}.
      * @param host A NativePageHost to load URLs.
      */
-    public HistoryPage(Activity activity, NativePageHost host) {
+    public HistoryPage(ChromeActivity activity, NativePageHost host) {
         super(activity, host);
 
         mThemeColor = !host.isIncognito()
@@ -40,7 +41,7 @@ public class HistoryPage extends BasicNativePage {
     }
 
     @Override
-    protected void initialize(Activity activity, final NativePageHost host) {
+    protected void initialize(ChromeActivity activity, final NativePageHost host) {
         mHistoryManager = new HistoryManager(activity, false,
                 ((SnackbarManageable) activity).getSnackbarManager(), host.isIncognito());
         mTitle = activity.getString(R.string.menu_history);

chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPage.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BasicNativePage;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.NativePageHost;
 import org.chromium.chrome.browser.UrlConstants;
@@ -47,12 +48,12 @@ public class IncognitoNewTabPage
      * Constructs an Incognito NewTabPage.
      * @param activity The activity used to create the new tab page's View.
      */
-    public IncognitoNewTabPage(Activity activity, NativePageHost host) {
+    public IncognitoNewTabPage(ChromeActivity activity, NativePageHost host) {
         super(activity, host, true);
     }
 
     @Override
-    protected void initialize(Activity activity, final NativePageHost host) {
+    protected void initialize(ChromeActivity activity, final NativePageHost host) {
         mActivity = activity;
 
         mIncognitoNewTabPageManager = new IncognitoNewTabPageManager() {

chrome/android/java/src/org/chromium/chrome/browser/ntp/NativePageFactory.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.ntp;
 
-import android.app.Activity;
 import android.net.Uri;
 
 import org.chromium.base.VisibleForTesting;
@@ -44,15 +43,15 @@ public class NativePageFactory {
             return new NewTabPage(activity, new TabShim(tab), tabModelSelector);
         }
 
-        protected NativePage buildBookmarksPage(Activity activity, Tab tab) {
+        protected NativePage buildBookmarksPage(ChromeActivity activity, Tab tab) {
             return new BookmarkPage(activity, new TabShim(tab));
         }
 
-        protected NativePage buildDownloadsPage(Activity activity, Tab tab) {
+        protected NativePage buildDownloadsPage(ChromeActivity activity, Tab tab) {
             return new DownloadPage(activity, new TabShim(tab));
         }
 
-        protected NativePage buildHistoryPage(Activity activity, Tab tab) {
+        protected NativePage buildHistoryPage(ChromeActivity activity, Tab tab) {
             return new HistoryPage(activity, new TabShim(tab));
         }
 

chrome/android/junit/src/org/chromium/chrome/browser/ntp/NativePageFactoryTest.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.ntp;
 
-import android.app.Activity;
 import android.view.View;
 
 import org.junit.Assert;
@@ -97,7 +96,7 @@ public class NativePageFactoryTest {
         }
 
         @Override
-        public NativePage buildBookmarksPage(Activity activity, Tab tab) {
+        public NativePage buildBookmarksPage(ChromeActivity activity, Tab tab) {
             return new MockNativePage(NativePageType.BOOKMARKS);
         }