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

Unified Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java

Issue 834723002: Fix ChromeShell TabObservers and upstream more things (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 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/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java
index 2bf260ade48bd5a9b696d4d54219a0331003f769..8e5ab6f208a50a922f9d511be39e681563990fa6 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java
@@ -24,10 +24,11 @@ import org.chromium.ui.base.WindowAndroid;
* and extends {@link Tab}.
*/
public class ChromeShellTab extends Tab {
+ private final TabManager mTabManager;
+
// Tab state
private boolean mIsLoading;
private boolean mIsFullscreen = false;
- private TabManager mTabManager;
/**
* @param context The Context the view is running in.
@@ -38,7 +39,7 @@ public class ChromeShellTab extends Tab {
public ChromeShellTab(Context context, String url, WindowAndroid window,
ContentViewClient contentViewClient, TabManager tabManager) {
super(false, context, window);
- initialize();
+ initializeNative();
initContentViewCore();
setContentViewClient(contentViewClient);
loadUrlWithSanitization(url);
@@ -117,11 +118,13 @@ public class ChromeShellTab extends Tab {
@Override
public void onLoadStarted() {
mIsLoading = true;
+ super.onLoadStarted();
}
@Override
public void onLoadStopped() {
mIsLoading = false;
+ super.onLoadStopped();
}
@Override
@@ -139,6 +142,8 @@ public class ChromeShellTab extends Tab {
public void webContentsCreated(long sourceWebContents, long openerRenderFrameId,
String frameName, String targetUrl, long newWebContents) {
mTabManager.createTab(targetUrl, TabLaunchType.FROM_LINK);
+ super.webContentsCreated(
+ sourceWebContents, openerRenderFrameId, frameName, targetUrl, newWebContents);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698