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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/document/TabDelegateImpl.java

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.document; 5 package org.chromium.chrome.browser.document;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.text.TextUtils; 8 import android.text.TextUtils;
9 9
10 import org.chromium.chrome.browser.ChromeMobileApplication; 10 import org.chromium.chrome.browser.ChromeMobileApplication;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 ChromeLauncherActivity.launchDocumentInstance(getActivityFromTab(parent) , mIsIncognito, 147 ChromeLauncherActivity.launchDocumentInstance(getActivityFromTab(parent) , mIsIncognito,
148 documentLaunchMode, loadUrlParams.getUrl(), documentStartedBy, 148 documentLaunchMode, loadUrlParams.getUrl(), documentStartedBy,
149 loadUrlParams.getTransitionType(), params); 149 loadUrlParams.getTransitionType(), params);
150 } 150 }
151 151
152 private Activity getActivityFromTab(Tab tab) { 152 private Activity getActivityFromTab(Tab tab) {
153 return tab == null || tab.getWindowAndroid() == null 153 return tab == null || tab.getWindowAndroid() == null
154 ? null : tab.getWindowAndroid().getActivity().get(); 154 ? null : tab.getWindowAndroid().getActivity().get();
155 } 155 }
156 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698