Chromium Code Reviews

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/Tab.java

Issue 481803004: Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the nit. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
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 c76ebc33a63ec2f08fce0714594af2de75fc46b3..ea43fff8bc9d3dae0b2aff66c8985d666260ffad 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -544,7 +544,7 @@ public class Tab implements NavigationClient {
/** Stop the current navigation. */
public void stopLoading() {
- if (mContentViewCore != null) mContentViewCore.stopLoading();
+ if (mContentViewCore != null) mContentViewCore.getWebContents().stop();
}
/**
@@ -552,7 +552,7 @@ public class Tab implements NavigationClient {
*/
public int getBackgroundColor() {
if (mNativePage != null) return mNativePage.getBackgroundColor();
- if (mContentViewCore != null) return mContentViewCore.getBackgroundColor();
+ if (mContentViewCore != null) return mContentViewCore.getWebContents().getBackgroundColor();
return Color.WHITE;
}
@@ -873,7 +873,7 @@ public class Tab implements NavigationClient {
*/
@CalledByNative
public String getUrl() {
- return mContentViewCore != null ? mContentViewCore.getUrl() : "";
+ return mContentViewCore != null ? mContentViewCore.getWebContents().getUrl() : "";
}
/**
@@ -882,7 +882,7 @@ public class Tab implements NavigationClient {
@CalledByNative
public String getTitle() {
if (mNativePage != null) return mNativePage.getTitle();
- if (mContentViewCore != null) return mContentViewCore.getTitle();
+ if (mContentViewCore != null) return mContentViewCore.getWebContents().getTitle();
return "";
}
@@ -892,10 +892,11 @@ public class Tab implements NavigationClient {
*/
public Bitmap getFavicon() {
if (mContentViewCore != null) {
- if (mFavicon == null || !mContentViewCore.getUrl().equals(mFaviconUrl)) {
+ if (mFavicon == null || !mContentViewCore.getWebContents().getUrl().
+ equals(mFaviconUrl)) {
if (mNativeTabAndroid == 0) return null;
mFavicon = nativeGetFavicon(mNativeTabAndroid);
- mFaviconUrl = mContentViewCore.getUrl();
+ mFaviconUrl = mContentViewCore.getWebContents().getUrl();
}
}
return mFavicon;

Powered by Google App Engine