content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java - Issue 335293002: Dismiss WebsiteSettings when a new page is committed.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java

Issue 335293002: Dismiss WebsiteSettings when a new page is committed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: also fix chrome-layer tests Created 6 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

« no previous file with comments | « content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java

diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java

index 1e25a92b0bb64f608a35f9c1db74710554e10856..5872be16b532956b5193e67848d217428efae5ce 100644

--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java

+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java

@@ -9,6 +9,7 @@ import org.chromium.content.browser.WebContentsObserverAndroid;

import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;

import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageStartedHelper;

import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnReceivedErrorHelper;

+import org.chromium.content_public.browser.WebContents;

/**

* The default WebContentsObserverAndroid used by ContentView tests. The below callbacks can be

@@ -16,12 +17,17 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnRece

public class TestWebContentsObserver extends WebContentsObserverAndroid {

- private OnPageStartedHelper mOnPageStartedHelper;

- private OnPageFinishedHelper mOnPageFinishedHelper;

- private OnReceivedErrorHelper mOnReceivedErrorHelper;

+ private final OnPageStartedHelper mOnPageStartedHelper;

+ private final OnPageFinishedHelper mOnPageFinishedHelper;

+ private final OnReceivedErrorHelper mOnReceivedErrorHelper;

+ // TODO(yfriedman): Switch everyone to use the WebContents constructor.

public TestWebContentsObserver(ContentViewCore contentViewCore) {

- super(contentViewCore);

+ this(contentViewCore.getWebContents());

+ }

+ public TestWebContentsObserver(WebContents webContents) {

+ super(webContents);

mOnPageStartedHelper = new OnPageStartedHelper();

mOnPageFinishedHelper = new OnPageFinishedHelper();

mOnReceivedErrorHelper = new OnReceivedErrorHelper();