projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.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
0be8537
..
0e5a655
100644
(file)
--- a/
src/chrome/browser/ui/android/navigation_popup.cc
+++ b/
src/chrome/browser/ui/android/navigation_popup.cc
@@
-19,7
+19,6
@@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/android/java_bitmap.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 "url/gurl.h"
#include "ui/gfx/image/image.h"
#include "url/gurl.h"
@@
-49,8
+48,7
@@
void NavigationPopup::FetchFaviconForUrl(JNIEnv* env,
// TODO(tedchoc): Request higher favicons based on screen density instead of
// hardcoding kFaviconSize.
favicon_service->GetFaviconImageForPageURL(
// TODO(tedchoc): Request higher favicons based on screen density instead of
// hardcoding kFaviconSize.
favicon_service->GetFaviconImageForPageURL(
- FaviconService::FaviconForPageURLParams(
- url, favicon_base::FAVICON, gfx::kFaviconSize),
+ url,
base::Bind(&NavigationPopup::OnFaviconDataAvailable,
base::Unretained(this),
url),
base::Bind(&NavigationPopup::OnFaviconDataAvailable,
base::Unretained(this),
url),