Add a flag to disable to New Tab Page toolbar

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

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 2cca3fb1a2b7b646c8b8d4206c1151b78f16b7a5..a62558c1504d93f006bff6404185389b9e348173 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
@@ -119,6 +119,9 @@
         /** @return Whether the NTP Interests tab is enabled and its button should be shown. */
         boolean isInterestsEnabled();
 
+        /** @return Whether the toolbar at the bottom of the NTP is enabled and should be shown. */
+        boolean isToolbarEnabled();
+
         /** @return Whether the document mode opt out promo should be shown. */
         boolean shouldShowOptOutPromo();
 
@@ -301,25 +304,39 @@ public void onClick(View v) {
             }
         });
 
+        // Set up the toolbar
         NewTabPageToolbar toolbar = (NewTabPageToolbar) findViewById(R.id.ntp_toolbar);
-        toolbar.getRecentTabsButton().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mManager.navigateToRecentTabs();
-            }
-        });
-        toolbar.getBookmarksButton().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mManager.navigateToBookmarks();
-            }
-        });
-        toolbar.getInterestsButton().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mManager.navigateToInterests();
+        if (manager.isToolbarEnabled()) {
+            toolbar.getRecentTabsButton().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mManager.navigateToRecentTabs();
+                }
+            });
+            toolbar.getBookmarksButton().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mManager.navigateToBookmarks();
+                }
+            });
+            toolbar.getInterestsButton().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mManager.navigateToInterests();
+                }
+            });
+
+            // Set up interests
+            if (manager.isInterestsEnabled()) {
+                toolbar.getInterestsButton().setVisibility(View.VISIBLE);
             }
-        });
+        } else {
+            ((ViewGroup) toolbar.getParent()).removeView(toolbar);
+            FrameLayout.LayoutParams params =
+                    (FrameLayout.LayoutParams) mScrollView.getLayoutParams();
+            params.bottomMargin = 0;
+            mScrollView.setLayoutParams(params);
+        }
 
         initializeSearchBoxScrollHandling();
         addOnLayoutChangeListener(this);
@@ -354,11 +371,6 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
             });
             snippetsManager.setSnippetsView(mSnippetsView);
         }
-
-        // Set up interests
-        if (manager.isInterestsEnabled()) {
-            toolbar.getInterestsButton().setVisibility(View.VISIBLE);
-        }
     }
 
     private int getTabsMovedIllustration() {