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

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

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: comments Created 3 years, 10 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/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 738da92bf543933a7a3fa329109f434745141277..c2fa5faec55c816f600795790a524ca9823e475b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -125,7 +125,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.common.Referrer;
import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.base.PageTransition;
-import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.base.ViewRoot;
import org.chromium.ui.widget.Toast;
import java.lang.annotation.Retention;
@@ -285,9 +285,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
}
private class TabbedModeTabCreator extends ChromeTabCreator {
- public TabbedModeTabCreator(ChromeActivity activity, WindowAndroid nativeWindow,
- boolean incognito) {
- super(activity, nativeWindow, incognito);
+ public TabbedModeTabCreator(ChromeActivity activity, ViewRoot viewRoot, boolean incognito) {
+ super(activity, viewRoot, incognito);
}
@Override
@@ -1152,9 +1151,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
@Override
protected Pair<TabbedModeTabCreator, TabbedModeTabCreator> createTabCreators() {
- return Pair.create(
- new TabbedModeTabCreator(this, getWindowAndroid(), false),
- new TabbedModeTabCreator(this, getWindowAndroid(), true));
+ return Pair.create(new TabbedModeTabCreator(this, getViewRoot(), false),
+ new TabbedModeTabCreator(this, getViewRoot(), true));
}
/**

Powered by Google App Engine
This is Rietveld 408576698