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

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

Patch Set: style issues fixed 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 | « android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c675a438866e7ff5a6aaa5dc200780b38fa59783..2248dd29bc78b405b4b8b8e199125b2b9500b9c5 100644

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

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

@@ -31,7 +31,7 @@ import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.NavigationClient;

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

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

import org.chromium.content_public.browser.LoadUrlParams;

import org.chromium.content_public.browser.NavigationHistory;

import org.chromium.content_public.browser.WebContents;

@@ -121,7 +121,7 @@ public class Tab implements NavigationClient {

// Content layer Observers and Delegates

private ContentViewClient mContentViewClient;

- private WebContentsObserverAndroid mWebContentsObserver;

+ private WebContentsObserver mWebContentsObserver;

private VoiceSearchTabHelper mVoiceSearchTabHelper;

private TabChromeWebContentsDelegateAndroid mWebContentsDelegate;

private DomDistillerFeedbackReporter mDomDistillerFeedbackReporter;

@@ -261,8 +261,8 @@ public class Tab implements NavigationClient {

}

- private class TabWebContentsObserverAndroid extends WebContentsObserverAndroid {

- public TabWebContentsObserverAndroid(WebContents webContents) {

+ private class TabWebContentsObserver extends WebContentsObserver {

+ public TabWebContentsObserver(WebContents webContents) {

super(webContents);

}

@@ -808,7 +808,7 @@ public class Tab implements NavigationClient {

mContentViewCore = cvc;

mWebContentsDelegate = createWebContentsDelegate();

- mWebContentsObserver = new TabWebContentsObserverAndroid(mContentViewCore.getWebContents());

+ mWebContentsObserver = new TabWebContentsObserver(mContentViewCore.getWebContents());

mVoiceSearchTabHelper = new VoiceSearchTabHelper(mContentViewCore.getWebContents());

if (mContentViewClient != null) mContentViewCore.setContentViewClient(mContentViewClient);