OLD | NEW |
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; | 5 package org.chromium.chrome.browser; |
6 | 6 |
7 import android.annotation.SuppressLint; | 7 import android.annotation.SuppressLint; |
8 import android.annotation.TargetApi; | 8 import android.annotation.TargetApi; |
9 import android.app.Activity; | 9 import android.app.Activity; |
10 import android.app.ActivityManager; | 10 import android.app.ActivityManager; |
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1150 recordLauncherShortcutAction(true); | 1150 recordLauncherShortcutAction(true); |
1151 reportNewTabShortcutUsed(true); | 1151 reportNewTabShortcutUsed(true); |
1152 } else { | 1152 } else { |
1153 // Used by the Account management screen to open a n
ew incognito tab. | 1153 // Used by the Account management screen to open a n
ew incognito tab. |
1154 // Account management screen collects its metrics se
parately. | 1154 // Account management screen collects its metrics se
parately. |
1155 getTabCreator(true).launchUrl( | 1155 getTabCreator(true).launchUrl( |
1156 UrlConstants.NTP_URL, TabLaunchType.FROM_CHR
OME_UI, | 1156 UrlConstants.NTP_URL, TabLaunchType.FROM_CHR
OME_UI, |
1157 intent, mIntentHandlingTimeMs); | 1157 intent, mIntentHandlingTimeMs); |
1158 } | 1158 } |
1159 } else { | 1159 } else { |
1160 getTabCreator(true).launchUrl( | 1160 TabLaunchType launchType = IntentHandler.getTabLaunchTyp
e(intent); |
1161 url, TabLaunchType.FROM_LINK, intent, mIntentHan
dlingTimeMs); | 1161 if (launchType != null) { |
| 1162 getTabCreator(true).launchUrl( |
| 1163 url, launchType, intent, mIntentHandlingTime
Ms); |
| 1164 } else { |
| 1165 getTabCreator(true).launchUrl( |
| 1166 url, TabLaunchType.FROM_LINK, intent, mInten
tHandlingTimeMs); |
| 1167 } |
1162 } | 1168 } |
1163 break; | 1169 break; |
1164 default: | 1170 default: |
1165 assert false : "Unknown TabOpenType: " + tabOpenType; | 1171 assert false : "Unknown TabOpenType: " + tabOpenType; |
1166 break; | 1172 break; |
1167 } | 1173 } |
1168 getToolbarManager().setUrlBarFocus(false); | 1174 getToolbarManager().setUrlBarFocus(false); |
1169 } | 1175 } |
1170 | 1176 |
1171 @Override | 1177 @Override |
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2101 | 2107 |
2102 private boolean shouldCreateNewTabsUsingBottomSheet() { | 2108 private boolean shouldCreateNewTabsUsingBottomSheet() { |
2103 if (mShouldCreateNewTabsUsingBottomSheet == null) { | 2109 if (mShouldCreateNewTabsUsingBottomSheet == null) { |
2104 mShouldCreateNewTabsUsingBottomSheet = getBottomSheet() != null | 2110 mShouldCreateNewTabsUsingBottomSheet = getBottomSheet() != null |
2105 && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME
_NTP_REDESIGN); | 2111 && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME
_NTP_REDESIGN); |
2106 } | 2112 } |
2107 | 2113 |
2108 return mShouldCreateNewTabsUsingBottomSheet; | 2114 return mShouldCreateNewTabsUsingBottomSheet; |
2109 } | 2115 } |
2110 } | 2116 } |
OLD | NEW |