🔍 Introduce default search engine dialog

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java

 // Copyright 2017 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.searchwidget;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.support.v4.app.ActivityOptionsCompat;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.WindowDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
+import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.omnibox.AutocompleteController;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.ActivityWindowAndroid;
 
 /** Queries the user's default search engine and shows autocomplete suggestions. */
 public class SearchActivity extends AsyncInitializationActivity
         implements SnackbarManageable, SearchActivityLocationBarLayout.Delegate {
     /** Setting this field causes the Activity to finish itself immediately for tests. */
     private static boolean sIsDisabledForTest;
 
+    /** Run when the SearchActivity knows what info it needs to display to the user. */
+    private final Runnable mSearchEngineAvailableRunnable = new Runnable() {
+        @Override
+        public void run() {
+            AutocompleteController.nativePrefetchZeroSuggestResults();
+            CustomTabsConnection.getInstance(getApplication()).warmup(0);

[Ted C, 2017/04/26 20:21:52]

wha?

[gone, 2017/04/26 21:45:15]

/me shrugs.  It was already there.  It's been pushed back to where it used to be
in the last patch set.

+            mSearchBox.onDeferredStartup(isVoiceSearchIntent());
+        }
+    };
+
     /** Main content view. */
     private ViewGroup mContentView;
 
     /** Whether the native library has been loaded. */
     private boolean mIsNativeReady;
 
     /** Input submitted before before the native library was loaded. */
     private String mQueuedUrl;
 
     /** The View that represents the search box. */
@@ skipping 32 matching lines @@
         // Build the search box.
         mContentView = createContentView();
         mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
                 R.id.search_location_bar);
         mSearchBox.setDelegate(this);
         mSearchBox.setToolbarDataProvider(mSearchBoxDataProvider);
         mSearchBox.initializeControls(new WindowDelegate(getWindow()), getWindowAndroid());
         setContentView(mContentView);
 
         // Kick off everything needed for the user to type into the box.
+        // TODO(dfalcantara): We should prevent the user from doing anything while we're running the
+        //                    logic to determine if they need to see a search engine promo.  Given
+        //                    that the logic requires native to be loaded, we'll have to make some
+        //                    easy Java-only first-pass checks.
         beginQuery();
         mSearchBox.showCachedZeroSuggestResultsIfAvailable();
 
         // Kick off loading of the native library.
         mHandler.post(new Runnable() {
             @Override
             public void run() {
                 beginLoadingLibrary();
             }
         });
@@ skipping 21 matching lines @@
             public void run() {
                 onDeferredStartup();
             }
         });
     }
 
     @Override
     public void onDeferredStartup() {
         super.onDeferredStartup();
 
-        AutocompleteController.nativePrefetchZeroSuggestResults();
-        CustomTabsConnection.getInstance(getApplication()).warmup(0);
-        mSearchBox.onDeferredStartup(isVoiceSearchIntent());
+        // Force the user to choose a search engine if they have to.
+        if (!LocaleManager.getInstance().showSearchEnginePromoIfNeeded(
+                    this, mSearchEngineAvailableRunnable)) {
+            mSearchEngineAvailableRunnable.run();
+        }
     }
 
     @Override
     protected View getViewToBeDrawnBeforeInitializingNative() {
         return mSearchBox;
     }
 
     @Override
     public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ skipping 69 matching lines @@
         finish();
         overridePendingTransition(0, R.anim.activity_close_exit);
     }
 
     /** See {@link #sIsDisabledForTest}. */
     @VisibleForTesting
     static void disableForTests() {
         sIsDisabledForTest = true;
     }
 }