From be13e67e49b90d6d60a69ef9cbc2dc080c3627d4 Mon Sep 17 00:00:00 2001 From: hayato Date: Mon, 30 Mar 2015 21:51:38 -0700 Subject: Revert of Revert of Move //components/favicon code into the favicon namespace (patchset #1 id:1 of https://codereview.chromium.org/1045823004/) Reason for revert: Not a culprit. Bring it back. The layout tests continued to fail after reverting: https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.8%20(retina)/builds/27707 Original issue's description: > Revert of Move //components/favicon code into the favicon namespace (patchset #4 id:80001 of https://codereview.chromium.org/1028503004/) > > Reason for revert: > Blink gardening. Speculative revert for Blink layout test failures in WebKit Mac10.8 (retina): > https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.8%20%28retina%29/builds/27696 > chromium range: chromium revision 322799:322813 > https://chromium.googlesource.com/chromium/src/+log/494aec68691f10626b226892396d442503dd9af7%5E..e240ab4e9c5841de8cb65226a80008600416c365?pretty=fuller > > Original issue's description: > > 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 > > > > Committed: https://crrev.com/494aec68691f10626b226892396d442503dd9af7 > > Cr-Commit-Position: refs/heads/master@{#322799} > > TBR=sky@chromium.org,sdefresne@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=359513 > > Committed: https://crrev.com/c7c707f533da81e7c7d5c2201426ae60e4a0daf7 > Cr-Commit-Position: refs/heads/master@{#322969} TBR=sky@chromium.org,sdefresne@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=359513 Review URL: https://codereview.chromium.org/1043743003 Cr-Commit-Position: refs/heads/master@{#322980} --- components/favicon.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/favicon.gypi') diff --git a/components/favicon.gypi b/components/favicon.gypi index 8a9378b..d1aa277 100644 --- a/components/favicon.gypi +++ b/components/favicon.gypi @@ -24,11 +24,11 @@ 'favicon/core/fallback_icon_service.h', 'favicon/core/favicon_client.h', 'favicon/core/favicon_driver.h', + 'favicon/core/favicon_driver_observer.h', 'favicon/core/favicon_handler.cc', 'favicon/core/favicon_handler.h', 'favicon/core/favicon_service.cc', 'favicon/core/favicon_service.h', - 'favicon/core/favicon_tab_helper_observer.h', 'favicon/core/favicon_url.cc', 'favicon/core/favicon_url.h', ], -- cgit v1.1