🔍 Introduce default search engine dialog

chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java

 // Copyright 2016 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.locale;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 
+import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.preferences.SearchEnginePreference;
 import org.chromium.chrome.browser.snackbar.Snackbar;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarController;
@@ skipping 148 matching lines @@
             addSpecialSearchEngines();
         }
         preferences.edit().putBoolean(PREF_WAS_IN_SPECIAL_LOCALE, isInSpecialLocale).apply();
     }
 
     /**
      * Shows a promotion dialog about search engines depending on Locale and other conditions.
      * See {@link LocaleManager#getSearchEnginePromoShowType()} for possible types and logic.
      *
      * @param context     Context showing the dialog.
-     * @param onDismissed Run when the dialog has been dismissed.
+     * @param onDismissed Notified when the dialog is dismissed about whether the user acted on it.

[Ted C, 2017/04/27 18:10:32]

dismissed [and] whether the user acted on it?

[gone, 2017/04/27 18:15:22]

little weird, but i'll go with it

      * @return Whether such dialog is needed.
      */
-    public boolean showSearchEnginePromoIfNeeded(Context context, @Nullable Runnable onDismissed) {
+    public boolean showSearchEnginePromoIfNeeded(
+            Context context, @Nullable Callback<Boolean> onDismissed) {
         int shouldShow = getSearchEnginePromoShowType();
         switch (shouldShow) {
             case SEARCH_ENGINE_PROMO_DONT_SHOW:
                 return false;
             case SEARCH_ENGINE_PROMO_SHOW_SOGOU:
                 new SogouPromoDialog(context, this, onDismissed).show();
                 return true;
             case SEARCH_ENGINE_PROMO_SHOW_EXISTING:
             case SEARCH_ENGINE_PROMO_SHOW_NEW:
-                // TODO(dfalcantara): Show the search engine dialog.
-                return false;
+                DefaultSearchEnginePromoDialog.show(context, shouldShow, onDismissed);
+                return true;
             default:
                 assert false;
                 return false;
         }
     }
 
     /**
      * @return Whether auto switch for search engine is enabled.
      */
     public boolean isSearchEngineAutoSwitchEnabled() {
@@ skipping 47 matching lines @@
             return SEARCH_ENGINE_PROMO_DONT_SHOW;
         }
         return SEARCH_ENGINE_PROMO_SHOW_SOGOU;
     }
 
     private SpecialLocaleHandler getSpecialLocaleHandler() {
         if (mLocaleHandler == null) mLocaleHandler = new SpecialLocaleHandler(getSpecialLocaleId());
         return mLocaleHandler;
     }
 }