chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java - Issue 589113002: Rename java WebContentsObserverAndroid to WebContentsObserver

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: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

Issue 589113002: Rename java WebContentsObserverAndroid to WebContentsObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: changes incorporated in WebContentsObserverAndroid Created 6 years, 2 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 | « chrome/android/java/src/org/chromium/chrome/browser/VoiceSearchTabHelper.java ('k') | chromecast/shell/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java » ('j') | content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

index 92d07f3db426d388d728ebcf27e1d0e3fe78cae1..d4069fa5900c1bcfcc73991a669f386a802c02b5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

@@ -25,7 +25,7 @@ import android.widget.TextView;

import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.base.CalledByNative;

import org.chromium.chrome.R;

-import org.chromium.content.browser.WebContentsObserverAndroid;

+import org.chromium.content.browser.WebContentsObserver;

import org.chromium.content_public.browser.WebContents;

import java.net.URISyntaxException;

@@ -67,8 +67,8 @@ public class WebsiteSettingsPopup implements OnClickListener {

mDialog.setCanceledOnTouchOutside(true);

// This needs to come after other member initialization.

mNativeWebsiteSettingsPopup = nativeInit(this, webContents);

- final WebContentsObserverAndroid webContentsObserver =

- new WebContentsObserverAndroid(mWebContents) {

+ final WebContentsObserver webContentsObserver =

+ new WebContentsObserver(mWebContents) {

@Override

public void navigationEntryCommitted() {

// If a navigation is committed (e.g. from in-page redirect), the data we're