Add the UI for the Interests Prototype.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.ntp;
 
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ skipping 14 matching lines @@
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.compositor.layouts.content.InvalidationAwareThumbnailProvider;
 import org.chromium.chrome.browser.document.DocumentMetricIds;
 import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkUtils;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconAvailabilityCallback;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
 import org.chromium.chrome.browser.ntp.BookmarksPage.BookmarkSelectedListener;
+import org.chromium.chrome.browser.ntp.InterestsPage.InterestsListener;
 import org.chromium.chrome.browser.ntp.LogoBridge.Logo;
 import org.chromium.chrome.browser.ntp.LogoBridge.LogoObserver;
 import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.preferences.DocumentModeManager;
 import org.chromium.chrome.browser.preferences.DocumentModePreference;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.profiles.MostVisitedSites;
 import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver;
 import org.chromium.chrome.browser.profiles.MostVisitedSites.ThumbnailCallback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrlServiceObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.PageTransition;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Provides functionality when the user interacts with the NTP.
  */
 public class NewTabPage
         implements NativePage, InvalidationAwareThumbnailProvider, TemplateUrlServiceObserver {
 
     // The number of times that an opt-out promo will be shown.
     private static final int MAX_OPT_OUT_PROMO_COUNT = 10;
@@ skipping 86 matching lines @@
             NativePage page = BookmarksPage.buildPageInDocumentMode(
                     activity, tab, tabModelSelector, Profile.getLastUsedProfile(),
                     listener);
             page.updateForUrl(UrlConstants.BOOKMARKS_URL);
             Dialog dialog = new NativePageDialog(activity, page);
             listener.setDialog(dialog);
             dialog.show();
         }
     }
 
+    public static void launchInterestsDialog(Activity activity, Tab tab) {
+        InterestDialogSelectedListener listener = new InterestDialogSelectedListener(tab);
+        NativePage page = new InterestsPage(activity, tab, Profile.getLastUsedProfile(),
+                listener, activity);
+        Dialog dialog = new NativePageDialog(activity, page);
+        listener.setDialog(dialog);
+
+        dialog.show();
+    }
+
     public static void launchRecentTabsDialog(Activity activity, Tab tab) {
         DocumentRecentTabsManager manager = new DocumentRecentTabsManager(tab, activity);
         NativePage page = new RecentTabsPage(activity, manager);
         page.updateForUrl(UrlConstants.RECENT_TABS_URL);
         Dialog dialog = new NativePageDialog(activity, page);
         manager.setDialog(dialog);
         dialog.show();
     }
 
     @VisibleForTesting
@@ skipping 432 matching lines @@
         @Override
         public void onBookmarkSelected(String url, String title, Bitmap favicon) {
             if (mDialog != null) mDialog.dismiss();
             mTab.loadUrl(new LoadUrlParams(url));
         }
 
         public void setDialog(Dialog dialog) {
             mDialog = dialog;
         }
     }
+
+    private static class InterestDialogSelectedListener implements InterestsListener {
+        private static final String GOOGLE_SEARCH_URL_PATTERN =
+                "https://www.google.com/search?tbm=nws&q=%s";
+        private Dialog mDialog;
+        private final Tab mTab;
+
+        public InterestDialogSelectedListener(Tab tab) {
+            mTab = tab;
+        }
+
+        @Override
+        public void onInterestClicked(String name) {
+            if (mDialog == null) {

[Bernhard Bauer, 2015/09/29 14:33:28]

When would this happen?

[PEConn, 2015/11/18 15:26:57]

Done.

+                return;
+            }
+
+            try {
+                String url = String.format(GOOGLE_SEARCH_URL_PATTERN,

[newt (away), 2015/09/29 17:33:22]

I think you want TemplateUrlService.getInstance().getUrlForSearchQuery() here.

Creating Google search URLs manually is fraught with peril, and you definitely
shouldn't be doing that. For example, one immediate problem: this always
searches google.com, never google.co.uk or bing.fr or whatever the user's
default search engine is. (If you need to add custom query params to the URL,
you might need to modify or add a new method to TemplateUrlService.)

Also, how does this interact with non-Google search engines?

[PEConn, 2015/11/18 15:26:57]

Done.

+                        URLEncoder.encode(name, "UTF-8"));
+
+                mTab.loadUrl(new LoadUrlParams(url));
+            } catch (UnsupportedEncodingException e) {
+                // Don't redirect the tab if we have failed to encode the url. This should not
+                // happen.
+            }
+
+            mDialog.dismiss();
+        }
+
+        public void setDialog(Dialog dialog) {
+            mDialog = dialog;
+        }
+    }
 }