Carl
c8e8919714
* Updated patches for v79 Remaining issue: * blank tabs when running on x86 emulators Waiting on upstream to fix that. The other upstream storage bug (https://bugs.chromium.org/p/chromium/issues/detail?id=1033655) is fixed in this version.
52 lines
2.9 KiB
Diff
52 lines
2.9 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Tue, 12 Jun 2018 15:09:26 +0200
|
|
Subject: Disable all promo dialogs
|
|
|
|
---
|
|
.../chrome/browser/ChromeTabbedActivity.java | 30 +------------------
|
|
1 file changed, 1 insertion(+), 29 deletions(-)
|
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
@@ -801,35 +801,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
|
|
try (TraceEvent e = TraceEvent.scoped(
|
|
"ChromeTabbedActivity.createToolbarButtonInProductHelpController")) {
|
|
ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
|
|
- // Promos can only be shown when we start with ACTION_MAIN intent and
|
|
- // after FRE is complete. Native initialization can finish before the FRE flow is
|
|
- // complete, and this will only show promos on the second opportunity. This is
|
|
- // because the FRE is shown on the first opportunity, and we don't want to show such
|
|
- // content back to back.
|
|
- //
|
|
- // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks
|
|
- // might not have completed at this point and we could show multiple
|
|
- // promos.
|
|
- boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
|
|
- // Promo dialogs in multiwindow mode are broken on some devices:
|
|
- // http://crbug.com/354696
|
|
- boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this);
|
|
- if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
|
|
- && preferenceManager.readBoolean(
|
|
- ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, false)
|
|
- && !VrModuleProvider.getDelegate().isInVr()
|
|
- // VrModuleProvider.getDelegate().isInVr may not return true at this point
|
|
- // even though Chrome is about to enter VR, so we need to also check whether
|
|
- // we're launching into VR.
|
|
- && !VrModuleProvider.getIntentDelegate().isLaunchingIntoVr(this, getIntent())
|
|
- && !isLegacyMultiWindow) {
|
|
- isShowingPromo = maybeShowPromo();
|
|
- } else {
|
|
- preferenceManager.writeBoolean(
|
|
- ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, true);
|
|
- }
|
|
-
|
|
- ToolbarButtonInProductHelpController.create(this, isShowingPromo);
|
|
+ ToolbarButtonInProductHelpController.create(this, false);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.17.1
|
|
|