summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_web_ui.h
diff options
context:
space:
mode:
authorkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 01:32:01 +0000
committerkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 01:32:01 +0000
commit0ea3db50aa19bcc15dcf15fcf4e7b20be3b004fb (patch)
tree972c588c6b25ddbbcce41e50193c4346993f496e /chrome/browser/extensions/extension_web_ui.h
parent2494ceabbea6b78e7b5dda93717dcbcfbb1bc5a4 (diff)
downloadchromium_src-0ea3db50aa19bcc15dcf15fcf4e7b20be3b004fb.zip
chromium_src-0ea3db50aa19bcc15dcf15fcf4e7b20be3b004fb.tar.gz
chromium_src-0ea3db50aa19bcc15dcf15fcf4e7b20be3b004fb.tar.bz2
Convert some FaviconService functions to use New CancelableTaskTracker
This CL converts: FaviconService::GetFaviconImageForURL FaviconService::GetRawFaviconForURL FaviconService::GetFaviconForURL ---------- They depends on --------- HistoryService::GetFaviconsForURL ---------- which depends on -------- HistoryBackend::GetFaviconsForURL So please review above changes first. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FaviconService::GetFaviconImageForURL ---------- is used by -------------- bookmarks/bookmark_model.cc ui/intents/web_intent_icon_loader.cc ui/cocoa/history_menu_bridge.mm ui/toolbar/recent_tabs_sub_menu_model.cc ui/toolbar/back_forward_menu_model.cc ui/webui/ntp/app_launcher_handler.cc jumplist_win.cc FaviconService::GetRawFaviconForURL ---------- is used by -------------- android/provider/chrome_browser_provider.cc bookmarks/bookmark_html_writer.cc sync/glue/session_model_associator.cc ui/webui/extensions/extension_icon_source.cc ui/webui/favicon_source.cc ui/webui/ntp/android/bookmarks_handler.cc ui/webui/ntp/favicon_webui_handler.cc FaviconService::GetFaviconForURL ---------- is used by -------------- favicon/favicon_handler.h BUG=155883 Review URL: https://chromiumcodereview.appspot.com/11421188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_web_ui.h')
-rw-r--r--chrome/browser/extensions/extension_web_ui.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_web_ui.h b/chrome/browser/extensions/extension_web_ui.h
index f317cd4..77fe6c1 100644
--- a/chrome/browser/extensions/extension_web_ui.h
+++ b/chrome/browser/extensions/extension_web_ui.h
@@ -56,9 +56,11 @@ class ExtensionWebUI : public content::WebUIController {
static void RegisterUserPrefs(PrefService* prefs);
// Get the favicon for the extension by getting an icon from the manifest.
- static void GetFaviconForURL(Profile* profile,
- FaviconService::GetFaviconRequest* request,
- const GURL& page_url);
+ // Note. |callback| is always run asynchronously.
+ static void GetFaviconForURL(
+ Profile* profile,
+ const GURL& page_url,
+ const FaviconService::FaviconResultsCallback2& callback);
private:
// Unregister the specified override, and if it's the currently active one,