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

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

Issue 2472073003: Show AlertDialog when WebAPKs are enabled in chrome://flags but Unknown sources is disabled (Closed)
Patch Set: Merge branch 'master' into warning_dialog Created 4 years, 1 month 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/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index ec5babba7b5de48610d59f741e70b5adc6d69d4e..5a3fca6091711c24d0f9f8a16a2f88776acead0f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -99,6 +99,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.chrome.browser.util.IntentUtils;
import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
+import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
import org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewWrapper;
import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
import org.chromium.content.browser.ContentVideoView;
@@ -382,6 +383,12 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
} else {
preferenceManager.setPromosSkippedOnFirstStart(true);
}
+
+ // Notify users experimenting with WebAPKs if they need to do extra steps to enable
+ // WebAPKs.
+ if (ChromeVersionInfo.isCanaryBuild() || ChromeVersionInfo.isDevBuild()) {
gone 2016/11/04 22:07:43 Move the channel check into #launchWebApkRequireme
+ ChromeWebApkHost.launchWebApkRequirementsDialogIfNeeded(this);
+ }
}
initializeUI();

Powered by Google App Engine
This is Rietveld 408576698