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.SearchManager; | 10 import android.app.SearchManager; |
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
909 } | 909 } |
910 | 910 |
911 @Override | 911 @Override |
912 public void onNewIntentWithNative(Intent intent) { | 912 public void onNewIntentWithNative(Intent intent) { |
913 VideoPersister.getInstance().cleanup(this); | 913 VideoPersister.getInstance().cleanup(this); |
914 | 914 |
915 super.onNewIntentWithNative(intent); | 915 super.onNewIntentWithNative(intent); |
916 if (mIntentHandler.shouldIgnoreIntent(intent)) return; | 916 if (mIntentHandler.shouldIgnoreIntent(intent)) return; |
917 | 917 |
918 mIntentHandler.onNewIntent(intent); | 918 mIntentHandler.onNewIntent(intent); |
919 VrShellDelegate.onNewIntent(this, getIntent()); | |
mthiesse
2017/05/11 14:25:17
s/getIntent()/intent
ymalik
2017/05/11 17:22:56
Ah thanks. This is why you shouldn't address revie
| |
919 } | 920 } |
920 | 921 |
921 /** | 922 /** |
922 * @return Whether the given activity contains a CustomTab. | 923 * @return Whether the given activity contains a CustomTab. |
923 */ | 924 */ |
924 public boolean isCustomTab() { | 925 public boolean isCustomTab() { |
925 return false; | 926 return false; |
926 } | 927 } |
927 | 928 |
928 /** | 929 /** |
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2197 public void onExitVr() {} | 2198 public void onExitVr() {} |
2198 | 2199 |
2199 /** | 2200 /** |
2200 * Whether this Activity supports moving a {@link Tab} to the | 2201 * Whether this Activity supports moving a {@link Tab} to the |
2201 * {@link FullscreenWebContentsActivity} when it enters fullscreen. | 2202 * {@link FullscreenWebContentsActivity} when it enters fullscreen. |
2202 */ | 2203 */ |
2203 public boolean supportsFullscreenActivity() { | 2204 public boolean supportsFullscreenActivity() { |
2204 return false; | 2205 return false; |
2205 } | 2206 } |
2206 } | 2207 } |
OLD | NEW |