Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3627)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java

Issue 2922503002: Show an opaque background if showing the new user search engine promo. (Closed)
Patch Set: Add findbugs exclusion for code I didn't change :-/ Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
index a03d62d1f3cc376fe1c04052dd3db151a866cf36..dac7902b92883e08d5be85eeae254a9ad107cbf2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
@@ -10,15 +10,11 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.widget.Button;
-import org.chromium.base.ActivityState;
-import org.chromium.base.ApplicationStatus;
import org.chromium.base.Callback;
import org.chromium.base.VisibleForTesting;
-import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.metrics.RecordUserAction;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.locale.LocaleManager.SearchEnginePromoType;
-import org.chromium.chrome.browser.search_engines.TemplateUrlService;
import org.chromium.chrome.browser.widget.PromoDialog;
import org.chromium.chrome.browser.widget.RadioButtonLayout;
@@ -41,37 +37,14 @@ public class DefaultSearchEnginePromoDialog extends PromoDialog {
private DefaultSearchEngineDialogHelper mHelper;
/**
- * Construct and show the dialog. Will be asynchronous if the TemplateUrlService has not yet
- * been loaded.
+ * Construct the default search engine promo.
*
* @param activity Activity to build the dialog with.
* @param dialogType Type of dialog to show.
* @param onDismissed Notified about whether the user chose an engine when it got dismissed.
*/
- public static void show(final Activity activity, @SearchEnginePromoType final int dialogType,
- @Nullable final Callback<Boolean> onDismissed) {
- assert LibraryLoader.isInitialized();
-
- // Load up the search engines.
- final TemplateUrlService instance = TemplateUrlService.getInstance();
- instance.registerLoadListener(new TemplateUrlService.LoadListener() {
- @Override
- public void onTemplateUrlServiceLoaded() {
- instance.unregisterLoadListener(this);
-
- if (ApplicationStatus.getStateForActivity(activity) == ActivityState.DESTROYED) {
- if (onDismissed != null) onDismissed.onResult(false);
- return;
- }
-
- new DefaultSearchEnginePromoDialog(activity, dialogType, onDismissed).show();
- }
- });
- if (!instance.isLoaded()) instance.load();
- }
-
- private DefaultSearchEnginePromoDialog(
- Activity activity, int dialogType, @Nullable Callback<Boolean> onDismissed) {
+ DefaultSearchEnginePromoDialog(Activity activity, @SearchEnginePromoType int dialogType,
+ @Nullable Callback<Boolean> onDismissed) {
super(activity);
mDialogType = dialogType;
mOnDismissed = onDismissed;
@@ -80,6 +53,8 @@ public class DefaultSearchEnginePromoDialog extends PromoDialog {
// No one should be able to bypass this dialog by clicking outside or by hitting back.
setCancelable(false);
setCanceledOnTouchOutside(false);
+
+ if (dialogType == LocaleManager.SEARCH_ENGINE_PROMO_SHOW_NEW) forceOpaqueBackground();
}
@Override

Powered by Google App Engine
This is Rietveld 408576698