[Android] Open up API in jni bridge to fetch images from tab

chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h"
 #include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.h"
 #include "chrome/browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.h"
 #include "chrome/browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.h"
 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/android/bookmark_id.h"
 #include "components/bookmarks/common/android/bookmark_type.h"
-#include "components/enhanced_bookmarks/bookmark_image_service.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
 #include "components/enhanced_bookmarks/image_record.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/EnhancedBookmarksBridge_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaGlobalRef;
@@ skipping 33 matching lines @@
 EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env,
     jobject obj,
     Profile* profile) : weak_java_ref_(env, obj) {
   profile_ = profile;
   enhanced_bookmark_model_ =
       EnhancedBookmarkModelFactory::GetForBrowserContext(profile_);
   enhanced_bookmark_model_->SetVersionSuffix(chrome::VersionInfo().OSType());
   cluster_service_ =
       ChromeBookmarkServerClusterServiceFactory::GetForBrowserContext(profile_);
   cluster_service_->AddObserver(this);
-  bookmark_image_service_ =
-      BookmarkImageServiceFactory::GetForBrowserContext(profile_);
+  bookmark_image_service_ = static_cast<BookmarkImageServiceAndroid*>(
+      BookmarkImageServiceFactory::GetForBrowserContext(profile_));
   search_service_.reset(new BookmarkServerSearchService(
       profile_->GetRequestContext(),
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
       SigninManagerFactory::GetForProfile(profile_),
       EnhancedBookmarkModelFactory::GetForBrowserContext(profile_)));
   search_service_->AddObserver(this);
 }
 
 EnhancedBookmarksBridge::~EnhancedBookmarksBridge() {
   cluster_service_->RemoveObserver(this);
@@ skipping 11 matching lines @@
   DCHECK(j_callback);
 
   GURL url(base::android::ConvertJavaStringToUTF16(env, j_url));
   scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_ptr(
       new ScopedJavaGlobalRef<jobject>());
   j_callback_ptr->Reset(env, j_callback);
   bookmark_image_service_->SalientImageForUrl(
       url, base::Bind(&Callback, j_callback_ptr.release()));
 }
 
+void EnhancedBookmarksBridge::FetchImageForTab(JNIEnv* env,
+                                               jobject obj,
+                                               jobject j_tab) {
+  TabAndroid* tab = TabAndroid::GetNativeTab(env, j_tab);
+  bookmark_image_service_->RetrieveSalientImageFromContext(
+      tab->web_contents()->GetMainFrame(), tab->GetURL(), true);
+}

[Kibeom Kim (inactive), 2015/02/09 21:30:34]

In addition to using WebContent, since this is parallel to
BookmarkImageServiceAndroid::FinishSuccessfulPageLoadForTab . I think it's good
to put there.

[Kibeom Kim (inactive), 2015/02/09 21:57:24]

discussed offline. It's just two lines, so let's just leave it.

+
 ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(
     JNIEnv* env, jobject obj, jlong id, jint type) {
   DCHECK(enhanced_bookmark_model_->loaded());
   if (type != BookmarkType::BOOKMARK_TYPE_NORMAL) {
     return base::android::ConvertUTF8ToJavaString(env, std::string());
   }
 
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
       enhanced_bookmark_model_->bookmark_model(), static_cast<int64>(id));
 
@@ skipping 186 matching lines @@
   return reinterpret_cast<jlong>(new EnhancedBookmarksBridge(
         env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));
 }
 
 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace enhanced_bookmarks