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 ecc4529617952ece3609534d31240d2fd6515b2a..15f9ffc2b7d4055035db194c57c79be92e062de1 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java |
@@ -880,10 +880,11 @@ public class Tab implements NavigationClient { |
/** |
* @return The bitmap of the favicon scaled to 16x16dp. null if no favicon |
* is specified or it requires the default favicon. |
- * TODO(bauerb): Upstream implementation. |
*/ |
public Bitmap getFavicon() { |
- return null; |
+ if (mNativeTabAndroid == 0) |
+ return null; |
+ return nativeGetFavicon(mNativeTabAndroid); |
} |
/** |
@@ -1151,4 +1152,5 @@ public class Tab implements NavigationClient { |
private native void nativeSetActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, |
String title); |
private native boolean nativePrint(long nativeTabAndroid); |
+ private native Bitmap nativeGetFavicon(long nativeTabAndroid); |
} |