Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / android / navigation_popup.cc

diff --git a/src/chrome/browser/ui/android/navigation_popup.cc b/src/chrome/browser/ui/android/navigation_popup.cc
index 7eec8a2..48876a5 100644 (file)
--- a/src/chrome/browser/ui/android/navigation_popup.cc
+++ b/src/chrome/browser/ui/android/navigation_popup.cc
@@ -10,17 +10,16 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
-#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/url_constants.h"
-#include "grit/ui_resources.h"
+#include "components/history/core/browser/history_types.h"
 #include "jni/NavigationPopup_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/android/java_bitmap.h"
-#include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
+#include "ui/resources/grit/ui_resources.h"
 #include "url/gurl.h"
 
 using base::android::ConvertUTF8ToJavaString;
@@ -48,9 +47,8 @@ void NavigationPopup::FetchFaviconForUrl(JNIEnv* env,
   GURL url(base::android::ConvertJavaStringToUTF16(env, jurl));
   // TODO(tedchoc): Request higher favicons based on screen density instead of
   //                hardcoding kFaviconSize.
-  favicon_service->GetFaviconImageForURL(
-      FaviconService::FaviconForURLParams(
-          url, favicon_base::FAVICON, gfx::kFaviconSize),
+  favicon_service->GetFaviconImageForPageURL(
+      url,
       base::Bind(&NavigationPopup::OnFaviconDataAvailable,
                  base::Unretained(this),
                  url),