chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java - Issue 1435263003: [Android] Show document mode opt-out InfoBar on selected devices.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1435263003: [Android] Show document mode opt-out InfoBar on selected devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: show infobar also on native pages and fixed showing conditions Created 5 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

« no previous file with comments | « chrome/android/java/res/drawable-xxxhdpi/tabbed_mode_opt_in_infobar_icon.png ('k') | chrome/android/java/src/org/chromium/chrome/browser/infobar/TabbedModeOptInInfoBar.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

index 1b4cc4b962dfb6c2a5c898947529d6c7939435de..643275395fff23234c924eba770699f615f4fe6a 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -82,6 +82,7 @@ import org.chromium.chrome.browser.gsa.GSAServiceClient;

import org.chromium.chrome.browser.gsa.GSAState;

import org.chromium.chrome.browser.help.HelpAndFeedback;

import org.chromium.chrome.browser.infobar.InfoBarContainer;

+import org.chromium.chrome.browser.infobar.TabbedModeOptInInfoBar;

import org.chromium.chrome.browser.init.AsyncInitializationActivity;

import org.chromium.chrome.browser.metrics.LaunchMetrics;

import org.chromium.chrome.browser.metrics.StartupMetrics;

@@ -509,13 +510,12 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@Override

public void onLoadStopped(Tab tab, boolean toDifferentDocument) {

postDeferredStartupIfNeeded();

- showUpdateInfoBarIfNecessary();

+ showInfoBarsIfNecessary();

}

@Override

public void onPageLoadFinished(Tab tab) {

postDeferredStartupIfNeeded();

- showUpdateInfoBarIfNecessary();

OfflinePageUtils.showOfflineSnackbarIfNecessary(ChromeActivity.this, tab);

}

@@ -1503,8 +1503,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

}

- private void showUpdateInfoBarIfNecessary() {

+ private void showInfoBarsIfNecessary() {

getChromeApplication().getUpdateInfoBarHelper().showUpdateInfobarIfNecessary(this);

+ TabbedModeOptInInfoBar.showIfNecessary(this);

}

/**