| Index: chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
|
| index 189c9d7061029859d355ee425af58b03bfabc8b3..f87ca0e189caa63c911aeb319885f17edfed769b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
|
| @@ -9,91 +9,92 @@ import android.view.ContextMenu;
|
| import org.chromium.content.browser.ContentView;
|
|
|
| /**
|
| - * An observer that is notified of changes to a {@link TabBase} object.
|
| + * An observer that is notified of changes to a {@link Tab} object.
|
| */
|
| public interface TabObserver {
|
|
|
| /**
|
| - * Called when a {@link TabBase} is being destroyed.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when a {@link Tab} is being destroyed.
|
| + * @param tab The notifying {@link Tab}.
|
| */
|
| - void onDestroyed(TabBase tab);
|
| + void onDestroyed(Tab tab);
|
|
|
| /**
|
| * Called when the tab content changes (to/from native pages or swapping native WebContents).
|
| - * @param tab The notifying {@link TabBase}.
|
| + * @param tab The notifying {@link Tab}.
|
| */
|
| - void onContentChanged(TabBase tab);
|
| + void onContentChanged(Tab tab);
|
|
|
| /**
|
| - * Called when the favicon of a {@link TabBase} has been updated.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when the favicon of a {@link Tab} has been updated.
|
| + * @param tab The notifying {@link Tab}.
|
| */
|
| - void onFaviconUpdated(TabBase tab);
|
| + void onFaviconUpdated(Tab tab);
|
|
|
| /**
|
| - * Called when the title of a {@link TabBase} changes.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when the title of a {@link Tab} changes.
|
| + * @param tab The notifying {@link Tab}.
|
| */
|
| - void onTitleUpdated(TabBase tab);
|
| + void onTitleUpdated(Tab tab);
|
|
|
| /**
|
| - * Called when the URL of a {@link TabBase} changes.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when the URL of a {@link Tab} changes.
|
| + * @param tab The notifying {@link Tab}.
|
| */
|
| - void onUrlUpdated(TabBase tab);
|
| + void onUrlUpdated(Tab tab);
|
|
|
| /**
|
| - * Called when the WebContents of a {@link TabBase} have been swapped.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when the WebContents of a {@link Tab} have been swapped.
|
| + * @param tab The notifying {@link Tab}.
|
| * @param didStartLoad Whether WebContentsObserver::DidStartProvisionalLoadForFrame() has
|
| * already been called.
|
| * @param didFinishLoad Whether WebContentsObserver::DidFinishLoad() has already been called.
|
| */
|
| - void onWebContentsSwapped(TabBase tab, boolean didStartLoad, boolean didFinishLoad);
|
| + void onWebContentsSwapped(Tab tab, boolean didStartLoad, boolean didFinishLoad);
|
|
|
| /**
|
| - * Called when a context menu is shown for a {@link ContentView} owned by a {@link TabBase}.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when a context menu is shown for a {@link ContentView} owned by a {@link Tab}.
|
| + * @param tab The notifying {@link Tab}.
|
| * @param menu The {@link ContextMenu} that is being shown.
|
| */
|
| - void onContextMenuShown(TabBase tab, ContextMenu menu);
|
| + void onContextMenuShown(Tab tab, ContextMenu menu);
|
|
|
| // WebContentsDelegateAndroid methods ---------------------------------------------------------
|
|
|
| /**
|
| - * Called when the load progress of a {@link TabBase} changes.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when the load progress of a {@link Tab} changes.
|
| + * @param tab The notifying {@link Tab}.
|
| * @param progress The new progress from [0,100].
|
| */
|
| - void onLoadProgressChanged(TabBase tab, int progress);
|
| + void onLoadProgressChanged(Tab tab, int progress);
|
|
|
| /**
|
| - * Called when the URL of a {@link TabBase} changes.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when the URL of a {@link Tab} changes.
|
| + * @param tab The notifying {@link Tab}.
|
| * @param url The new URL.
|
| */
|
| - void onUpdateUrl(TabBase tab, String url);
|
| + void onUpdateUrl(Tab tab, String url);
|
|
|
| /**
|
| - * Called when the {@link TabBase} should enter or leave fullscreen mode.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * Called when the {@link Tab} should enter or leave fullscreen mode.
|
| + * @param tab The notifying {@link Tab}.
|
| * @param enable Whether or not to enter fullscreen mode.
|
| */
|
| - void onToggleFullscreenMode(TabBase tab, boolean enable);
|
| + void onToggleFullscreenMode(Tab tab, boolean enable);
|
|
|
| // WebContentsObserverAndroid methods ---------------------------------------------------------
|
|
|
| /**
|
| * Called when an error occurs while loading a page and/or the page fails to load.
|
| - * @param tab The notifying {@link TabBase}.
|
| + * @param tab The notifying {@link Tab}.
|
| * @param isProvisionalLoad Whether the failed load occurred during the provisional load.
|
| * @param isMainFrame Whether failed load happened for the main frame.
|
| * @param errorCode Code for the occurring error.
|
| * @param description The description for the error.
|
| * @param failingUrl The url that was loading when the error occurred.
|
| */
|
| - void onDidFailLoad(TabBase tab, boolean isProvisionalLoad, boolean isMainFrame, int errorCode,
|
| + void onDidFailLoad(
|
| + Tab tab, boolean isProvisionalLoad, boolean isMainFrame, int errorCode,
|
| String description, String failingUrl);
|
|
|
| }
|
|
|