summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-03-30 10:17:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-30 17:18:00 +0000
commit494aec68691f10626b226892396d442503dd9af7 (patch)
tree3cf53649ec6e4c708d419928ca798b5bc6641dee /chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
parent24c5e71f6cc5f1033485d83bd7d767c45071cf16 (diff)
downloadchromium_src-494aec68691f10626b226892396d442503dd9af7.zip
chromium_src-494aec68691f10626b226892396d442503dd9af7.tar.gz
chromium_src-494aec68691f10626b226892396d442503dd9af7.tar.bz2
Move //components/favicon code into the favicon namespace
Move all classes defined in //components/favicon into the favicon namespace and update all client code forward-declaration and usage. Rename FaviconTabHelperObserver to FaviconDriverObserver as FaviconDriver is the name of the base interface (and iOS wants to use that observer but will not be able to use FaviconTabHelper). BUG=359513 Review URL: https://codereview.chromium.org/1028503004 Cr-Commit-Position: refs/heads/master@{#322799}
Diffstat (limited to 'chrome/browser/ui/webui/ntp/favicon_webui_handler.cc')
-rw-r--r--chrome/browser/ui/webui/ntp/favicon_webui_handler.cc5
1 files changed, 3 insertions, 2 deletions
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;