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

Side by Side Diff: chrome/browser/android/provider/chrome_browser_provider.cc

Issue 56143002: Make FaviconService() use Porfile as parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test but break the DEPS Created 7 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/provider/chrome_browser_provider.h" 5 #include "chrome/browser/android/provider/chrome_browser_provider.h"
6 6
7 #include <list> 7 #include <list>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 CancelableRequestConsumer* cancelable_consumer, 666 CancelableRequestConsumer* cancelable_consumer,
667 CancelableTaskTracker* cancelable_tracker) 667 CancelableTaskTracker* cancelable_tracker)
668 : FaviconServiceTask(favicon_service, profile, 668 : FaviconServiceTask(favicon_service, profile,
669 cancelable_consumer, cancelable_tracker) {} 669 cancelable_consumer, cancelable_tracker) {}
670 670
671 chrome::FaviconBitmapResult Run(const GURL& url) { 671 chrome::FaviconBitmapResult Run(const GURL& url) {
672 RunAsyncRequestOnUIThreadBlocking( 672 RunAsyncRequestOnUIThreadBlocking(
673 base::Bind(&FaviconService::GetRawFaviconForURL, 673 base::Bind(&FaviconService::GetRawFaviconForURL,
674 base::Unretained(service()), 674 base::Unretained(service()),
675 FaviconService::FaviconForURLParams( 675 FaviconService::FaviconForURLParams(
676 profile(),
677 url, 676 url,
678 chrome::FAVICON | chrome::TOUCH_ICON, 677 chrome::FAVICON | chrome::TOUCH_ICON,
679 gfx::kFaviconSize), 678 gfx::kFaviconSize),
680 ResourceBundle::GetSharedInstance().GetMaxScaleFactor(), 679 ResourceBundle::GetSharedInstance().GetMaxScaleFactor(),
681 base::Bind( 680 base::Bind(
682 &BookmarkIconFetchTask::OnFaviconRetrieved, 681 &BookmarkIconFetchTask::OnFaviconRetrieved,
683 base::Unretained(this)), 682 base::Unretained(this)),
684 cancelable_tracker())); 683 cancelable_tracker()));
685 return result_; 684 return result_;
686 } 685 }
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
1612 Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj()); 1611 Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj());
1613 } else if (type == 1612 } else if (type ==
1614 chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) { 1613 chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
1615 JNIEnv* env = AttachCurrentThread(); 1614 JNIEnv* env = AttachCurrentThread();
1616 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env); 1615 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
1617 if (obj.is_null()) 1616 if (obj.is_null())
1618 return; 1617 return;
1619 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj()); 1618 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
1620 } 1619 }
1621 } 1620 }
OLDNEW
« no previous file with comments | « chrome/browser/android/favicon_helper.cc ('k') | chrome/browser/bookmarks/bookmark_html_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698