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

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

Issue 2873843002: Support autopresenting WebVr content. (Closed)
Patch Set: Address review comments Created 3 years, 7 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; 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 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 boolean ignoreIncognitoFiles = !hadCipherData; 860 boolean ignoreIncognitoFiles = !hadCipherData;
861 mTabModelSelectorImpl.loadState(ignoreIncognitoFiles); 861 mTabModelSelectorImpl.loadState(ignoreIncognitoFiles);
862 } 862 }
863 863
864 mIntentWithEffect = false; 864 mIntentWithEffect = false;
865 if ((mIsOnFirstRun || getSavedInstanceState() == null) && intent != null) { 865 if ((mIsOnFirstRun || getSavedInstanceState() == null) && intent != null) {
866 if (!mIntentHandler.shouldIgnoreIntent(intent)) { 866 if (!mIntentHandler.shouldIgnoreIntent(intent)) {
867 mIntentWithEffect = mIntentHandler.onNewIntent(intent); 867 mIntentWithEffect = mIntentHandler.onNewIntent(intent);
868 } 868 }
869 869
870 // We send this intent so that we can enter WebVr presentation m ode if needed.
mthiesse 2017/05/11 14:25:17 This should probably live in ChromeActivity in cas
ymalik 2017/05/11 17:22:56 Totally. At first I was worried because the first
871 VrShellDelegate.onNewIntent(this, getIntent());
872
870 if (isMainIntentFromLauncher(intent)) { 873 if (isMainIntentFromLauncher(intent)) {
871 if (IntentHandler.getUrlFromIntent(intent) == null) { 874 if (IntentHandler.getUrlFromIntent(intent) == null) {
872 assert !mIntentWithEffect 875 assert !mIntentWithEffect
873 : "ACTION_MAIN should not have triggered any pri or action"; 876 : "ACTION_MAIN should not have triggered any pri or action";
874 mIntentWithEffect = maybeLaunchNtpFromMainIntent(intent) ; 877 mIntentWithEffect = maybeLaunchNtpFromMainIntent(intent) ;
875 } 878 }
876 logMainIntentBehavior(intent); 879 logMainIntentBehavior(intent);
877 } 880 }
878 } 881 }
879 882
(...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after
2040 if (info.id == sMergedInstanceTaskId) return true; 2043 if (info.id == sMergedInstanceTaskId) return true;
2041 } 2044 }
2042 return false; 2045 return false;
2043 } 2046 }
2044 2047
2045 @Override 2048 @Override
2046 public boolean supportsFullscreenActivity() { 2049 public boolean supportsFullscreenActivity() {
2047 return true; 2050 return true;
2048 } 2051 }
2049 } 2052 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698