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

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

Issue 1163173002: Pull methods upwards from ChromeTabCreator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the rebase 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 35f4d1d24867b2fd2b141a81d5379eb62df9e4ee..2a1957fc190b1c8e1c7f24d81f529a975e4b6ba2 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -74,7 +74,9 @@ import org.chromium.chrome.browser.signin.SigninPromoScreen;
import org.chromium.chrome.browser.snackbar.undo.UndoBarPopupController;
import org.chromium.chrome.browser.sync.SyncController;
import org.chromium.chrome.browser.tab.ChromeTab;
+import org.chromium.chrome.browser.tabmodel.ChromeTabCreator;
import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
+import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator;
import org.chromium.chrome.browser.tabmodel.TabModel;
import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
import org.chromium.chrome.browser.tabmodel.TabModelObserver;
@@ -343,6 +345,20 @@ public class ChromeTabbedActivity extends CompositorChromeActivity implements Ac
}
}
+ @Override
+ public ChromeTabCreator getTabCreator(boolean incognito) {
+ TabCreator tabCreator = super.getTabCreator(incognito);
+ assert tabCreator instanceof ChromeTabCreator;
+ return (ChromeTabCreator) tabCreator;
+ }
+
+ @Override
+ public ChromeTabCreator getCurrentTabCreator() {
+ TabCreator tabCreator = super.getCurrentTabCreator();
+ assert tabCreator instanceof ChromeTabCreator;
+ return (ChromeTabCreator) tabCreator;
+ }
+
private void handleDebugIntent(Intent intent) {
if (ACTION_CLOSE_TABS.equals(intent.getAction())) {
getTabModelSelector().closeAllTabs();

Powered by Google App Engine
This is Rietveld 408576698