summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/webui/fallback_icon_source.cc3
-rw-r--r--chrome/browser/ui/webui/fallback_icon_source.h4
-rw-r--r--chrome/browser/ui/webui/large_icon_source.cc3
-rw-r--r--chrome/browser/ui/webui/large_icon_source.h4
4 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/ui/webui/fallback_icon_source.cc b/chrome/browser/ui/webui/fallback_icon_source.cc
index 5ca4746..e568b9d 100644
--- a/chrome/browser/ui/webui/fallback_icon_source.cc
+++ b/chrome/browser/ui/webui/fallback_icon_source.cc
@@ -26,8 +26,7 @@ FallbackIconSource::FallbackIconSource() {
#else
font_list.push_back(l10n_util::GetStringUTF8(IDS_SANS_SERIF_FONT_FAMILY));
#endif
- fallback_icon_service_.reset(
- new favicon_base::FallbackIconService(font_list));
+ fallback_icon_service_.reset(new FallbackIconService(font_list));
}
FallbackIconSource::~FallbackIconSource() {
diff --git a/chrome/browser/ui/webui/fallback_icon_source.h b/chrome/browser/ui/webui/fallback_icon_source.h
index ba4843e..acc1d6b 100644
--- a/chrome/browser/ui/webui/fallback_icon_source.h
+++ b/chrome/browser/ui/webui/fallback_icon_source.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_WEBUI_FALLBACK_ICON_SOURCE_H_
#include "base/memory/scoped_ptr.h"
-#include "components/favicon_base/fallback_icon_service.h"
+#include "components/favicon/core/fallback_icon_service.h"
#include "content/public/browser/url_data_source.h"
// FallbackIconSource services explicit chrome:// requests for fallback icons.
@@ -61,7 +61,7 @@ class FallbackIconSource : public content::URLDataSource {
void SendDefaultResponse(
const content::URLDataSource::GotDataCallback& callback);
- scoped_ptr<favicon_base::FallbackIconService> fallback_icon_service_;
+ scoped_ptr<FallbackIconService> fallback_icon_service_;
DISALLOW_COPY_AND_ASSIGN(FallbackIconSource);
};
diff --git a/chrome/browser/ui/webui/large_icon_source.cc b/chrome/browser/ui/webui/large_icon_source.cc
index 4dc270e..e28d342 100644
--- a/chrome/browser/ui/webui/large_icon_source.cc
+++ b/chrome/browser/ui/webui/large_icon_source.cc
@@ -51,8 +51,7 @@ LargeIconSource::LargeIconSource(Profile* profile) : profile_(profile) {
#else
font_list.push_back(l10n_util::GetStringUTF8(IDS_SANS_SERIF_FONT_FAMILY));
#endif
- fallback_icon_service_.reset(
- new favicon_base::FallbackIconService(font_list));
+ fallback_icon_service_.reset(new FallbackIconService(font_list));
}
LargeIconSource::~LargeIconSource() {
diff --git a/chrome/browser/ui/webui/large_icon_source.h b/chrome/browser/ui/webui/large_icon_source.h
index 7d5da6b..df3fad6 100644
--- a/chrome/browser/ui/webui/large_icon_source.h
+++ b/chrome/browser/ui/webui/large_icon_source.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/task/cancelable_task_tracker.h"
-#include "components/favicon_base/fallback_icon_service.h"
+#include "components/favicon/core/fallback_icon_service.h"
#include "components/favicon_base/favicon_types.h"
#include "content/public/browser/url_data_source.h"
@@ -73,7 +73,7 @@ class LargeIconSource : public content::URLDataSource {
base::CancelableTaskTracker cancelable_task_tracker_;
- scoped_ptr<favicon_base::FallbackIconService> fallback_icon_service_;
+ scoped_ptr<FallbackIconService> fallback_icon_service_;
DISALLOW_COPY_AND_ASSIGN(LargeIconSource);
};