chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java - Issue 1688603004: AGSA-initiated weblite intents should be rewritten if Chrome can use weblite

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

Issue 1688603004: AGSA-initiated weblite intents should be rewritten if Chrome can use weblite (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: bug fix Created 4 years, 10 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

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

index d9285307dec9f8d2ca99704adbb1685b8ebeace9..c11a7229de6906c05e29439a8a83c33848d24bab 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;

import org.chromium.chrome.browser.firstrun.FirstRunStatus;

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

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

+import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;

import org.chromium.chrome.browser.ntp.NewTabPage;

import org.chromium.chrome.browser.preferences.ChromePreferenceManager;

import org.chromium.chrome.browser.preferences.PrefServiceBridge;

@@ -585,6 +586,16 @@ public class DocumentActivity extends ChromeActivity {

mTab = createActivityTab(asyncParams);

}

+ if (!isIncognito() && asyncParams != null) {

+ LoadUrlParams loadUrlParams = asyncParams.getLoadUrlParams();

+ if (loadUrlParams != null && loadUrlParams.getUrl() != null) {

+ loadUrlParams.setUrl(DataReductionProxySettings.getInstance()

+ .maybeRewriteWebliteUrl(loadUrlParams.getUrl()));

+ }

+ mTab = createActivityTab(asyncParams);

jbudorick 2016/03/01 17:59:06 Was adding this line intentional or the product of

gone 2016/03/01 18:08:48 It's definitely a screwed up rebase; you can see t

if (asyncParams != null && asyncParams.getWebContents() != null) {

Intent parentIntent = IntentUtils.safeGetParcelableExtra(getIntent(),

IntentHandler.EXTRA_PARENT_INTENT);