summaryrefslogtreecommitdiffstats
path: root/chrome/browser/favicon_service.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 16:55:56 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 16:55:56 +0000
commit1fd1a5043e4de3078e3e05684a14055474da0d0b (patch)
tree25d28a7c713fd8bbda6e28bd599d4a890e6b3254 /chrome/browser/favicon_service.cc
parent76b0f686facc70c33f2983c115933006654ee482 (diff)
downloadchromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.zip
chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.tar.gz
chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.tar.bz2
Move WebUIFactory to chrome/, try 2.
first try was r79691 This fixes the SiteInstance unit test failure. SiteInstance has all kinds of dependencies into chrome/. This fixes the unittest just enough to get it passing without trying to refactor SiteInstance at all. BUG=77092 TEST=trybots, again Review URL: http://codereview.chromium.org/6731060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon_service.cc')
-rw-r--r--chrome/browser/favicon_service.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/favicon_service.cc b/chrome/browser/favicon_service.cc
index ddf632b..05caa22 100644
--- a/chrome/browser/favicon_service.cc
+++ b/chrome/browser/favicon_service.cc
@@ -7,8 +7,8 @@
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/history_backend.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
#include "chrome/common/url_constants.h"
-#include "content/browser/webui/web_ui_factory.h"
FaviconService::FaviconService(Profile* profile) : profile_(profile) {
}
@@ -54,7 +54,8 @@ FaviconService::Handle FaviconService::GetFaviconForURL(
FaviconService::Handle handle = request->handle();
if (page_url.SchemeIs(chrome::kChromeUIScheme) ||
page_url.SchemeIs(chrome::kExtensionScheme)) {
- WebUIFactory::GetFaviconForURL(profile_, request, page_url);
+ ChromeWebUIFactory::GetInstance()->GetFaviconForURL(
+ profile_, request, page_url);
} else {
HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
if (hs)