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

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

Issue 2774763002: Kick incognito tabs from CCTs to tabbed mode. (Closed)
Patch Set: Created 3 years, 9 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.SearchManager; 10 import android.app.SearchManager;
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 OfflinePageUtils.saveBookmarkOffline(newBookmarkId, tabT oBookmark); 1420 OfflinePageUtils.saveBookmarkOffline(newBookmarkId, tabT oBookmark);
1421 } 1421 }
1422 } else { 1422 } else {
1423 bookmarkModel.destroy(); 1423 bookmarkModel.destroy();
1424 } 1424 }
1425 } 1425 }
1426 }); 1426 });
1427 } 1427 }
1428 1428
1429 /** 1429 /**
1430 * @return Whether the tab models have been fully initialized.
1431 */
1432 public boolean isTabModelsInitialized() {
Theresa 2017/03/23 21:09:09 nit: areTabModelsInitialized
Ted C 2017/03/23 22:06:22 Done.
1433 return mTabModelsInitialized;
1434 }
1435
1436 /**
1430 * {@link TabModelSelector} no longer implements TabModel. Use getTabModelS elector() or 1437 * {@link TabModelSelector} no longer implements TabModel. Use getTabModelS elector() or
1431 * getCurrentTabModel() depending on your needs. 1438 * getCurrentTabModel() depending on your needs.
1432 * @return The {@link TabModelSelector}, possibly null. 1439 * @return The {@link TabModelSelector}, possibly null.
1433 */ 1440 */
1434 public TabModelSelector getTabModelSelector() { 1441 public TabModelSelector getTabModelSelector() {
1435 if (!mTabModelsInitialized) { 1442 if (!mTabModelsInitialized) {
1436 throw new IllegalStateException( 1443 throw new IllegalStateException(
1437 "Attempting to access TabModelSelector before initialization "); 1444 "Attempting to access TabModelSelector before initialization ");
1438 } 1445 }
1439 return mTabModelSelector; 1446 return mTabModelSelector;
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
2128 * draw over VR contents should be hidden in this call. 2135 * draw over VR contents should be hidden in this call.
2129 */ 2136 */
2130 public void onEnterVR() {} 2137 public void onEnterVR() {}
2131 2138
2132 /** 2139 /**
2133 * Called when VR mode using this activity is exited. Any state set for VR s hould be restored 2140 * Called when VR mode using this activity is exited. Any state set for VR s hould be restored
2134 * in this call, including showing 2D UI that was hidden. 2141 * in this call, including showing 2D UI that was hidden.
2135 */ 2142 */
2136 public void onExitVR() {} 2143 public void onExitVR() {}
2137 } 2144 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698