chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 983043003: Componentize FaviconService and FaviconHandler

Side by Side Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.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

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/ui/webui/chrome_web_ui_controller_factory.h"	5 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/location.h"	11 #include "base/location.h"

12 #include "base/message_loop/message_loop_proxy.h"	12 #include "base/message_loop/message_loop_proxy.h"

13 #include "base/prefs/pref_service.h"	13 #include "base/prefs/pref_service.h"

14 #include "chrome/browser/about_flags.h"	14 #include "chrome/browser/about_flags.h"

15 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"	15 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"

16 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"	16 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"

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

18 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/profiles/profile_manager.h"	18 #include "chrome/browser/profiles/profile_manager.h"

20 #include "chrome/browser/ui/webui/about_ui.h"	19 #include "chrome/browser/ui/webui/about_ui.h"

21 #include "chrome/browser/ui/webui/app_launcher_page_ui.h"	20 #include "chrome/browser/ui/webui/app_launcher_page_ui.h"

22 #include "chrome/browser/ui/webui/bookmarks_ui.h"	21 #include "chrome/browser/ui/webui/bookmarks_ui.h"

23 #include "chrome/browser/ui/webui/components_ui.h"	22 #include "chrome/browser/ui/webui/components_ui.h"

24 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"	23 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"

25 #include "chrome/browser/ui/webui/copresence_ui.h"	24 #include "chrome/browser/ui/webui/copresence_ui.h"

26 #include "chrome/browser/ui/webui/crashes_ui.h"	25 #include "chrome/browser/ui/webui/crashes_ui.h"

27 #include "chrome/browser/ui/webui/device_log_ui.h"	26 #include "chrome/browser/ui/webui/device_log_ui.h"

(...skipping 26 matching lines...) Expand all Loading...
54 #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"	53 #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"

55 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"	54 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"

56 #include "chrome/browser/ui/webui/version_ui.h"	55 #include "chrome/browser/ui/webui/version_ui.h"

57 #include "chrome/common/chrome_switches.h"	56 #include "chrome/common/chrome_switches.h"

58 #include "chrome/common/pref_names.h"	57 #include "chrome/common/pref_names.h"

59 #include "chrome/common/url_constants.h"	58 #include "chrome/common/url_constants.h"

60 #include "components/dom_distiller/core/dom_distiller_constants.h"	59 #include "components/dom_distiller/core/dom_distiller_constants.h"

61 #include "components/dom_distiller/core/dom_distiller_service.h"	60 #include "components/dom_distiller/core/dom_distiller_service.h"

62 #include "components/dom_distiller/core/url_constants.h"	61 #include "components/dom_distiller/core/url_constants.h"

63 #include "components/dom_distiller/webui/dom_distiller_ui.h"	62 #include "components/dom_distiller/webui/dom_distiller_ui.h"

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

64 #include "components/favicon_base/favicon_util.h"	64 #include "components/favicon_base/favicon_util.h"

65 #include "components/favicon_base/select_favicon_frames.h"	65 #include "components/favicon_base/select_favicon_frames.h"

66 #include "components/history/core/browser/history_types.h"	66 #include "components/history/core/browser/history_types.h"

67 #include "components/password_manager/core/common/password_manager_switches.h"	67 #include "components/password_manager/core/common/password_manager_switches.h"

68 #include "components/signin/core/common/profile_management_switches.h"	68 #include "components/signin/core/common/profile_management_switches.h"

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

70 #include "content/public/browser/web_ui.h"	70 #include "content/public/browser/web_ui.h"

71 #include "content/public/common/content_client.h"	71 #include "content/public/common/content_client.h"

72 #include "content/public/common/url_utils.h"	72 #include "content/public/common/url_utils.h"

73 #include "ui/gfx/favicon_size.h"	73 #include "ui/gfx/favicon_size.h"

(...skipping 661 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
735 #endif	735 #endif

736	736

737 // Android doesn't use the plugins pages.	737 // Android doesn't use the plugins pages.

738 if (page_url.host() == chrome::kChromeUIPluginsHost)	738 if (page_url.host() == chrome::kChromeUIPluginsHost)

739 return PluginsUI::GetFaviconResourceBytes(scale_factor);	739 return PluginsUI::GetFaviconResourceBytes(scale_factor);

740	740

741 #endif	741 #endif

742	742

743 return NULL;	743 return NULL;

744 }	744 }

OLD	NEW