chrome/browser/favicon/favicon_tab_helper.cc - Issue 983043003: Componentize FaviconService and FaviconHandler

Side by Side Diff: chrome/browser/favicon/favicon_tab_helper.cc

Issue 983043003: Componentize FaviconService and FaviconHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@favicon_service

Patch Set: Fix android_aosp (reverted the change by mistake by switching computer) 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/favicon/favicon_service_factory.cc ('k') | chrome/browser/favicon/favicon_tab_helper_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/favicon/favicon_tab_helper.h"	5 #include "chrome/browser/favicon/favicon_tab_helper.h"

6	6

7 #include "chrome/browser/chrome_notification_types.h"	7 #include "chrome/browser/chrome_notification_types.h"

8 #include "chrome/browser/favicon/chrome_favicon_client.h"	8 #include "chrome/browser/favicon/chrome_favicon_client.h"

9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"	9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"

10 #include "chrome/browser/favicon/favicon_handler.h"

11 #include "chrome/browser/favicon/favicon_service.h"

12 #include "chrome/browser/favicon/favicon_service_factory.h"	10 #include "chrome/browser/favicon/favicon_service_factory.h"

13 #include "chrome/browser/favicon/favicon_tab_helper_observer.h"

14 #include "chrome/browser/history/history_service_factory.h"	11 #include "chrome/browser/history/history_service_factory.h"

15 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/search/search.h"	13 #include "chrome/browser/search/search.h"

17 #include "chrome/common/chrome_constants.h"	14 #include "chrome/common/chrome_constants.h"

18 #include "chrome/common/url_constants.h"	15 #include "chrome/common/url_constants.h"

	16 #include "components/favicon/core/browser/favicon_handler.h"

	17 #include "components/favicon/core/browser/favicon_service.h"

	18 #include "components/favicon/core/browser/favicon_tab_helper_observer.h"

19 #include "components/favicon_base/favicon_types.h"	19 #include "components/favicon_base/favicon_types.h"

20 #include "components/history/core/browser/history_service.h"	20 #include "components/history/core/browser/history_service.h"

21 #include "content/public/browser/favicon_status.h"	21 #include "content/public/browser/favicon_status.h"

22 #include "content/public/browser/invalidate_type.h"	22 #include "content/public/browser/invalidate_type.h"

23 #include "content/public/browser/navigation_controller.h"	23 #include "content/public/browser/navigation_controller.h"

24 #include "content/public/browser/navigation_details.h"	24 #include "content/public/browser/navigation_details.h"

25 #include "content/public/browser/navigation_entry.h"	25 #include "content/public/browser/navigation_entry.h"

26 #include "content/public/browser/notification_service.h"	26 #include "content/public/browser/notification_service.h"

27 #include "content/public/browser/render_view_host.h"	27 #include "content/public/browser/render_view_host.h"

28 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

(...skipping 288 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
317 favicon_service->UnableToDownloadFavicon(image_url);	317 favicon_service->UnableToDownloadFavicon(image_url);

318 }	318 }

319	319

320 favicon_handler_->OnDidDownloadFavicon(	320 favicon_handler_->OnDidDownloadFavicon(

321 id, image_url, bitmaps, original_bitmap_sizes);	321 id, image_url, bitmaps, original_bitmap_sizes);

322 if (touch_icon_handler_.get()) {	322 if (touch_icon_handler_.get()) {

323 touch_icon_handler_->OnDidDownloadFavicon(	323 touch_icon_handler_->OnDidDownloadFavicon(

324 id, image_url, bitmaps, original_bitmap_sizes);	324 id, image_url, bitmaps, original_bitmap_sizes);

325 }	325 }

326 }	326 }

OLD	NEW