chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java - Issue 1206673003: Merge java_staging/src into java/src.

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/document/DocumentActivity.java

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/document/CipherKeyActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/DocumentMigrationHelper.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_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

similarity index 99%

rename from chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java

rename to chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

index 202b9877dca19fc52d83d1733672e301bde39626..43f6565f32cef7e456351bb6c791a2cdf529957a 100644

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

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

@@ -474,7 +474,9 @@ public class DocumentActivity extends ChromeActivity {

loadUrlParams.setIntentReceivedTimestamp(getOnCreateTimestampUptimeMs());

}

- IntentHandler.addReferrerAndHeaders(loadUrlParams, intent, this);

+ if (intent != null) {

+ IntentHandler.addReferrerAndHeaders(loadUrlParams, intent, this);

+ }

if (pendingData != null) {

if (pendingData.postData != null) {