Commit d292b012 authored by yfriedman's avatar yfriedman Committed by Commit bot

Pass LoadUrlParams instead of just url to TabObserver.onLoadUrl

Some observers will need more information than just the url.

BUG=443773

Review URL: https://codereview.chromium.org/930933006

Cr-Commit-Position: refs/heads/master@{#317588}
parent 2d81cac8
...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser; ...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser;
import android.view.ContextMenu; import android.view.ContextMenu;
import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewCore;
import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContents;
/** /**
...@@ -38,6 +39,9 @@ public class EmptyTabObserver implements TabObserver { ...@@ -38,6 +39,9 @@ public class EmptyTabObserver implements TabObserver {
@Override @Override
public void onLoadUrl(Tab tab, String url, int loadType) { } public void onLoadUrl(Tab tab, String url, int loadType) { }
@Override
public void onLoadUrl(Tab tab, LoadUrlParams params, int loadType) { }
@Override @Override
public void onPageLoadStarted(Tab tab) { } public void onPageLoadStarted(Tab tab) { }
......
...@@ -781,7 +781,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener, ...@@ -781,7 +781,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
params.getIsRendererInitiated(), params.getIntentReceivedTimestamp()); params.getIsRendererInitiated(), params.getIntentReceivedTimestamp());
for (TabObserver observer : mObservers) { for (TabObserver observer : mObservers) {
observer.onLoadUrl(this, params.getUrl(), loadType); observer.onLoadUrl(this, params, loadType);
} }
return loadType; return loadType;
} finally { } finally {
......
...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser; ...@@ -7,6 +7,7 @@ package org.chromium.chrome.browser;
import android.view.ContextMenu; import android.view.ContextMenu;
import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewCore;
import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContents;
/** /**
...@@ -60,10 +61,17 @@ public interface TabObserver { ...@@ -60,10 +61,17 @@ public interface TabObserver {
*/ */
void onOverlayContentViewCoreRemoved(Tab tab, ContentViewCore content); void onOverlayContentViewCoreRemoved(Tab tab, ContentViewCore content);
/**
* Use onLoadUrl(Tab, LoadUrlParams, int)
* TODO(yfriedman): Remove this
*/
@Deprecated
void onLoadUrl(Tab tab, String url, int loadType);
/** /**
* Called when loadUrl is triggered on a a {@link Tab}. * Called when loadUrl is triggered on a a {@link Tab}.
* @param tab The notifying {@link Tab}. * @param tab The notifying {@link Tab}.
* @param url The url that is being loaded. * @param params The params describe the page being loaded.
* @param loadType The type of load that was performed. * @param loadType The type of load that was performed.
* *
* @see TabLoadStatus#PAGE_LOAD_FAILED * @see TabLoadStatus#PAGE_LOAD_FAILED
...@@ -71,7 +79,8 @@ public interface TabObserver { ...@@ -71,7 +79,8 @@ public interface TabObserver {
* @see TabLoadStatus#PARTIAL_PRERENDERED_PAGE_LOAD * @see TabLoadStatus#PARTIAL_PRERENDERED_PAGE_LOAD
* @see TabLoadStatus#FULL_PRERENDERED_PAGE_LOAD * @see TabLoadStatus#FULL_PRERENDERED_PAGE_LOAD
*/ */
void onLoadUrl(Tab tab, String url, int loadType); void onLoadUrl(Tab tab, LoadUrlParams params, int loadType);
/** /**
* Called when a tab has started to load a page. * Called when a tab has started to load a page.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment