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

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

Issue 1174263006: [Document mode] Force more pathways to use the TabDelegate instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Null guarding 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
Index: chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java
index d036574eee2f28c60030e1ed8ca23c598e991942..74530fa066a549cf64d212b6f388ce2d2f6d3bfd 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java
@@ -10,9 +10,11 @@ import android.net.Uri;
import org.chromium.chrome.browser.document.ChromeLauncherActivity;
import org.chromium.chrome.browser.document.DocumentMetricIds;
-import org.chromium.chrome.browser.document.PendingDocumentData;
+import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
+import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.components.service_tab_launcher.ServiceTabLauncher;
+import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.common.Referrer;
import org.chromium.ui.base.PageTransition;
@@ -37,16 +39,15 @@ public class ChromeServiceTabLauncher extends ServiceTabLauncher {
int intentSource = DocumentMetricIds.STARTED_BY_WINDOW_OPEN;
if (FeatureUtilities.isDocumentMode(context)) {
- PendingDocumentData data = new PendingDocumentData();
- data.url = url;
- data.postData = postData;
- data.extraHeaders = extraHeaders;
- data.referrer = new Referrer(referrerUrl, referrerPolicy);
- data.requestId = requestId;
+ LoadUrlParams loadUrlParams = new LoadUrlParams(url, PageTransition.LINK);
+ loadUrlParams.setPostData(postData);
+ loadUrlParams.setVerbatimHeaders(extraHeaders);
+ loadUrlParams.setReferrer(new Referrer(referrerUrl, referrerPolicy));
- ChromeLauncherActivity.launchDocumentInstance(null /* activity */, incognito,
- ChromeLauncherActivity.LAUNCH_MODE_FOREGROUND, url, intentSource,
- PageTransition.LINK, data);
+ TabDelegate tabDelegate =
+ ChromeMobileApplication.getDocumentTabModelSelector().getTabCreator(incognito);
+ tabDelegate.createNewDocumentTab(loadUrlParams, TabLaunchType.FROM_MENU_OR_OVERVIEW,
+ null, ChromeLauncherActivity.LAUNCH_MODE_FOREGROUND, intentSource, requestId);
return;
}

Powered by Google App Engine
This is Rietveld 408576698