Chromium Code Reviews| 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 c3835b6baa0af5c92054476c0b252fb1fc0dcbd2..8282853fa6d47b9ca6987896f06a07983455c86e 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() { |
|
David Trainor- moved to gerrit
2014/07/07 17:59:04
We need to make sure this bitmap is scaled to 16x1
Jitu( very slow this week)
2014/07/09 11:07:11
I have changed the bitmap to 16x16 in native side.
|
| - 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); |
| } |