diff options
Diffstat (limited to 'chrome/browser/ui/webui')
8 files changed, 22 insertions, 14 deletions
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 69ad96c..023af7a 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -559,7 +559,7 @@ void RunFaviconCallbackAsync( const std::vector<favicon_base::FaviconRawBitmapResult>* results) { base::MessageLoopProxy::current()->PostTask( FROM_HERE, - base::Bind(&FaviconService::FaviconResultsCallbackRunner, + base::Bind(&favicon::FaviconService::FaviconResultsCallbackRunner, callback, base::Owned(results))); } diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index aa7ee85..aa4fc2e 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -210,8 +210,9 @@ void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon, } void ExtensionIconSource::LoadFaviconImage(int request_id) { - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile_, ServiceAccessType::EXPLICIT_ACCESS); + favicon::FaviconService* favicon_service = + FaviconServiceFactory::GetForProfile(profile_, + ServiceAccessType::EXPLICIT_ACCESS); // Fall back to the default icons if the service isn't available. if (favicon_service == NULL) { LoadDefaultImage(request_id); diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 1f15edf..7809e73 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -65,8 +65,9 @@ void FaviconSource::StartDataRequest( int render_process_id, int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile_, ServiceAccessType::EXPLICIT_ACCESS); + favicon::FaviconService* favicon_service = + FaviconServiceFactory::GetForProfile(profile_, + ServiceAccessType::EXPLICIT_ACCESS); if (!favicon_service) { SendDefaultResponse(callback); return; diff --git a/chrome/browser/ui/webui/large_icon_source.cc b/chrome/browser/ui/webui/large_icon_source.cc index 1c6d0d2..536b648 100644 --- a/chrome/browser/ui/webui/large_icon_source.cc +++ b/chrome/browser/ui/webui/large_icon_source.cc @@ -38,7 +38,7 @@ LargeIconSource::IconRequest::IconRequest( LargeIconSource::IconRequest::~IconRequest() { } -LargeIconSource::LargeIconSource(FaviconService* favicon_service, +LargeIconSource::LargeIconSource(favicon::FaviconService* favicon_service, FallbackIconService* fallback_icon_service) : favicon_service_(favicon_service), fallback_icon_service_(fallback_icon_service) { diff --git a/chrome/browser/ui/webui/large_icon_source.h b/chrome/browser/ui/webui/large_icon_source.h index 7fcb825..bfe3e65 100644 --- a/chrome/browser/ui/webui/large_icon_source.h +++ b/chrome/browser/ui/webui/large_icon_source.h @@ -14,7 +14,10 @@ #include "content/public/browser/url_data_source.h" class FallbackIconService; + +namespace favicon { class FaviconService; +} // LargeIconSource services explicit chrome:// requests for large icons. // @@ -33,7 +36,7 @@ class LargeIconSource : public content::URLDataSource { public: // |favicon_service| and |fallback_icon_service| are owned by caller and may // be null. - LargeIconSource(FaviconService* favicon_service, + LargeIconSource(favicon::FaviconService* favicon_service, FallbackIconService* fallback_icon_service); ~LargeIconSource() override; @@ -77,7 +80,7 @@ class LargeIconSource : public content::URLDataSource { base::CancelableTaskTracker cancelable_task_tracker_; - FaviconService* favicon_service_; + favicon::FaviconService* favicon_service_; FallbackIconService* fallback_icon_service_; diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index e82057a..801ba18 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -713,8 +713,9 @@ void AppLauncherHandler::HandleGenerateAppForLink(const base::ListValue* args) { app_sorting->PageIntegerAsStringOrdinal(static_cast<size_t>(page_index)); Profile* profile = Profile::FromWebUI(web_ui()); - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile, ServiceAccessType::EXPLICIT_ACCESS); + favicon::FaviconService* favicon_service = + FaviconServiceFactory::GetForProfile(profile, + ServiceAccessType::EXPLICIT_ACCESS); if (!favicon_service) { LOG(ERROR) << "No favicon service"; return; diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 28e2eb1..8f1c392 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -91,8 +91,9 @@ void FaviconWebUIHandler::HandleGetFaviconDominantColor( std::string dom_id; CHECK(args->GetString(1, &dom_id)); - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - Profile::FromWebUI(web_ui()), ServiceAccessType::EXPLICIT_ACCESS); + favicon::FaviconService* favicon_service = + FaviconServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()), + ServiceAccessType::EXPLICIT_ACCESS); if (!favicon_service || path.empty()) return; diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index e6a90c1..d81ebfb 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -86,8 +86,9 @@ void MostVisitedHandler::RegisterMessages() { // Set up our sources for top-sites data. content::URLDataSource::Add(profile, new ThumbnailListSource(profile)); - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile, ServiceAccessType::EXPLICIT_ACCESS); + favicon::FaviconService* favicon_service = + FaviconServiceFactory::GetForProfile(profile, + ServiceAccessType::EXPLICIT_ACCESS); FallbackIconService* fallback_icon_service = FallbackIconServiceFactory::GetForBrowserContext(profile); |