diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 07:11:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 07:11:19 +0000 |
| commit | 23a619b96fe4ff248ce784714ecb6ac907e92410 (patch) | |
| tree | 0bd9e8531ddb225c9847ecd0d0ea9fa65115bcfb /chrome/browser/history/android | |
| parent | e9cb0b79ae9ee9c9b67969ba113a02a34fe8ec12 (diff) | |
| download | chromium_src-23a619b96fe4ff248ce784714ecb6ac907e92410.zip chromium_src-23a619b96fe4ff248ce784714ecb6ac907e92410.tar.gz chromium_src-23a619b96fe4ff248ce784714ecb6ac907e92410.tar.bz2 | |
Fix FaviconHandler::GetRawFaviconForID
The Android API needs to be able to insert and retrieve arbitrary favicons from the history backend.
http://codereview.chromium.org/10891007/ changed the API such that it returns favicons resized to 16x16 which broke the API.
This changes GetRawFaviconForID to return unresized favicons and renames the method to GetLargestRawFaviconForID.
Bug=145799
Test=SQLiteCursorTest passes
Review URL: https://chromiumcodereview.appspot.com/10916144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/android')
| -rw-r--r-- | chrome/browser/history/android/sqlite_cursor.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/history/android/sqlite_cursor.cc b/chrome/browser/history/android/sqlite_cursor.cc index a350daa..786e157 100644 --- a/chrome/browser/history/android/sqlite_cursor.cc +++ b/chrome/browser/history/android/sqlite_cursor.cc @@ -11,7 +11,6 @@ #include "chrome/browser/history/android/android_history_types.h" #include "content/public/browser/browser_thread.h" #include "jni/SQLiteCursor_jni.h" -#include "ui/gfx/favicon_size.h" #include "sql/statement.h" using base::android::ConvertUTF8ToJavaString; @@ -241,8 +240,7 @@ void SQLiteCursor::GetFaviconForIDInUIThread( CancelableRequestConsumerBase* consumer, const FaviconService::FaviconRawCallback& callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - favicon_service_->GetRawFaviconForID(id, gfx::kFaviconSize, - ui::SCALE_FACTOR_100P, consumer, callback); + favicon_service_->GetLargestRawFaviconForID(id, consumer, callback); } |