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

Unified Diff: chrome/browser/ui/webui/fallback_icon_source.h

Issue 996253002: [Fallback Icons] Refactor FallbackIconService to be a BrowserContext-level singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/fallback_icon_source.h
diff --git a/chrome/browser/ui/webui/fallback_icon_source.h b/chrome/browser/ui/webui/fallback_icon_source.h
index ba4843e158bb902b602b7639ffac980c3171f965..0fae1b06414d234ffed7519238ca25f902a499c4 100644
--- a/chrome/browser/ui/webui/fallback_icon_source.h
+++ b/chrome/browser/ui/webui/fallback_icon_source.h
@@ -6,9 +6,15 @@
#define CHROME_BROWSER_UI_WEBUI_FALLBACK_ICON_SOURCE_H_
#include "base/memory/scoped_ptr.h"
-#include "components/favicon_base/fallback_icon_service.h"
#include "content/public/browser/url_data_source.h"
+class GURL;
+class Profile;
+
+namespace favicon_base {
+struct FallbackIconStyle;
+} // namespace favicon_base
+
// FallbackIconSource services explicit chrome:// requests for fallback icons.
//
// Format:
@@ -41,7 +47,7 @@
// 32 * 0.5 = 16, and the icon's background shape is a circle.
class FallbackIconSource : public content::URLDataSource {
public:
- FallbackIconSource();
+ explicit FallbackIconSource(Profile* profile);
~FallbackIconSource() override;
@@ -57,11 +63,18 @@ class FallbackIconSource : public content::URLDataSource {
bool ShouldServiceRequest(const net::URLRequest* request) const override;
private:
+ void SendFallbackIconHelper(
+ const GURL& url,
+ int size_in_pixels,
+ const favicon_base::FallbackIconStyle& style,
+ const content::URLDataSource::GotDataCallback& callback);
+
// Sends the default fallback icon.
void SendDefaultResponse(
const content::URLDataSource::GotDataCallback& callback);
- scoped_ptr<favicon_base::FallbackIconService> fallback_icon_service_;
+
+ Profile* profile_;
DISALLOW_COPY_AND_ASSIGN(FallbackIconSource);
};

Powered by Google App Engine
This is Rietveld 408576698