Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: chrome/browser/android/tab_android.cc

Issue 364793005: Implementation of GetFavicon for current tab. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the review comment Created 6 years, 6 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
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index baa0a000cb2aeef6856c7b08386b17534184d8da..2e626834ffdb34f3c9bff3be677f600c2fa036fd 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/browser_about_handler.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/google/google_url_tracker_factory.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/prerender/prerender_contents.h"
@@ -47,6 +48,9 @@
#include "content/public/browser/web_contents.h"
#include "jni/Tab_jni.h"
#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "ui/gfx/android/java_bitmap.h"
+
+using gfx::ConvertToJavaBitmap;
David Trainor- moved to gerrit 2014/07/07 17:59:04 Can we just use gfx::ConvertToJavaBitmap explicitl
Jitu( very slow this week) 2014/07/09 11:07:11 Done.
TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
@@ -517,6 +521,22 @@ bool TabAndroid::Print(JNIEnv* env, jobject obj) {
return true;
}
+ScopedJavaLocalRef<jobject> TabAndroid::GetFavicon(JNIEnv* env, jobject obj) {
+ ScopedJavaLocalRef<jobject> bitmap;
+ FaviconTabHelper* favicon_tab_helper =
+ FaviconTabHelper::FromWebContents(web_contents_.get());
+ if (!favicon_tab_helper)
+ return bitmap;
+ if (!favicon_tab_helper->FaviconIsValid())
+ return bitmap;
+
+ const SkBitmap& favicon = favicon_tab_helper->GetFavicon().AsBitmap();
David Trainor- moved to gerrit 2014/07/07 17:59:04 Should we be scaling this based on the device dens
Jitu( very slow this week) 2014/07/09 11:07:11 As per description GetRepresentation(float scale)
+ if(favicon.getSize() > 0)
+ bitmap = ConvertToJavaBitmap(&favicon);
+
+ return bitmap;
+}
+
prerender::PrerenderManager* TabAndroid::GetPrerenderManager() const {
Profile* profile = GetProfile();
if (!profile)

Powered by Google App Engine
This is Rietveld 408576698