diff options
50 files changed, 125 insertions, 71 deletions
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index a12ba30..b2968dd 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -93,7 +93,7 @@ static_library("browser") { "//components/domain_reliability", "//components/enhanced_bookmarks", "//components/favicon_base", - "//components/favicon/core", + "//components/favicon/core/browser", "//components/feedback", "//components/gcm_driver", "//components/google/core/browser", diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index d4eb584..149a97e 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -35,6 +35,7 @@ include_rules = [ "+components/dom_distiller", "+components/domain_reliability", "+components/enhanced_bookmarks", + "+components/favicon", "+components/favicon_base", "+components/feedback", "+components/gcm_driver", diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc index 4be9c0e..a91271f 100644 --- a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc +++ b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_types.h" #include "content/public/browser/browser_thread.h" #include "jni/PartnerBookmarksReader_jni.h" diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc index 50b21d6..871977e 100644 --- a/chrome/browser/android/favicon_helper.cc +++ b/chrome/browser/android/favicon_helper.cc @@ -13,7 +13,6 @@ #include "base/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" @@ -21,6 +20,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/profile_sync_service_factory.h" +#include "components/favicon/core/browser/favicon_service.h" #include "jni/FaviconHelper_jni.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/android/java_bitmap.h" diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index 13a5280..d07a08d 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -23,7 +23,6 @@ #include "chrome/browser/bookmarks/chrome_bookmark_client.h" #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/android/sqlite_cursor.h" #include "chrome/browser/history/history_service_factory.h" @@ -33,6 +32,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/android/android_history_types.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/top_sites.h" diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc index 00b9e36..f1f0bf8 100644 --- a/chrome/browser/android/shortcut_helper.cc +++ b/chrome/browser/android/shortcut_helper.cc @@ -16,7 +16,6 @@ #include "base/task/cancelable_task_tracker.h" #include "base/threading/worker_pool.h" #include "chrome/browser/banners/app_banner_settings_helper.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/manifest/manifest_icon_selector.h" #include "chrome/browser/profiles/profile.h" @@ -24,6 +23,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/web_application_info.h" #include "components/dom_distiller/core/url_utils.h" +#include "components/favicon/core/browser/favicon_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h index 1bb5c7e..9ee1255 100644 --- a/chrome/browser/android/tab_android.h +++ b/chrome/browser/android/tab_android.h @@ -11,12 +11,12 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" -#include "chrome/browser/favicon/favicon_tab_helper_observer.h" #include "chrome/browser/search/instant_service_observer.h" #include "chrome/browser/sync/glue/synced_tab_delegate_android.h" #include "chrome/browser/ui/search/search_tab_helper_delegate.h" #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" +#include "components/favicon/core/browser/favicon_tab_helper_observer.h" #include "components/sessions/session_id.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index eda8af0..73fcf38 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -17,10 +17,10 @@ #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "components/bookmarks/browser/bookmark_codec.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 4dcc1937..d4203a1 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/common/importer/imported_bookmark_entry.h" @@ -21,6 +20,7 @@ #include "chrome/utility/importer/bookmark_html_reader.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/test/bookmark_test_helpers.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_usage_data.h" #include "components/history/core/browser/history_service.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc index 863000e..14e2f1a 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/values.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" @@ -16,6 +15,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/url_database.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc index 8b0406f..5d63af5 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/launch_util.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_json_parser.h" @@ -24,6 +23,7 @@ #include "chrome/common/extensions/extension_metrics.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/web_application_info.h" +#include "components/favicon/core/browser/favicon_service.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/utility_process_host.h" #include "content/public/browser/utility_process_host_client.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 3048756..bd7d06b 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -15,11 +15,11 @@ #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_util.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc index e8ce4fe..6074c04 100644 --- a/chrome/browser/favicon/favicon_handler_unittest.cc +++ b/chrome/browser/favicon/favicon_handler_unittest.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/favicon/favicon_handler.h" +#include "components/favicon/core/browser/favicon_handler.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/favicon/chrome_favicon_client.h" #include "chrome/browser/favicon/chrome_favicon_client_factory.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" +#include "components/favicon/core/browser/favicon_service.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/favicon/favicon_service_factory.cc b/chrome/browser/favicon/favicon_service_factory.cc index 3218fb7..10814b3 100644 --- a/chrome/browser/favicon/favicon_service_factory.cc +++ b/chrome/browser/favicon/favicon_service_factory.cc @@ -7,9 +7,9 @@ #include "base/memory/singleton.h" #include "base/prefs/pref_service.h" #include "chrome/browser/favicon/chrome_favicon_client_factory.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/history_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc index 180e3a7..d95ffd1 100644 --- a/chrome/browser/favicon/favicon_tab_helper.cc +++ b/chrome/browser/favicon/favicon_tab_helper.cc @@ -7,15 +7,15 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/favicon/chrome_favicon_client.h" #include "chrome/browser/favicon/chrome_favicon_client_factory.h" -#include "chrome/browser/favicon/favicon_handler.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" -#include "chrome/browser/favicon/favicon_tab_helper_observer.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/url_constants.h" +#include "components/favicon/core/browser/favicon_handler.h" +#include "components/favicon/core/browser/favicon_service.h" +#include "components/favicon/core/browser/favicon_tab_helper_observer.h" #include "components/favicon_base/favicon_types.h" #include "components/history/core/browser/history_service.h" #include "content/public/browser/favicon_status.h" diff --git a/chrome/browser/favicon/favicon_tab_helper_browsertest.cc b/chrome/browser/favicon/favicon_tab_helper_browsertest.cc index e5facb7..81bd226 100644 --- a/chrome/browser/favicon/favicon_tab_helper_browsertest.cc +++ b/chrome/browser/favicon/favicon_tab_helper_browsertest.cc @@ -8,12 +8,12 @@ #include "base/run_loop.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/favicon/favicon_handler.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/favicon/core/browser/favicon_handler.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/history/android/DEPS b/chrome/browser/history/android/DEPS index d4ff1bb..8fdbf32 100644 --- a/chrome/browser/history/android/DEPS +++ b/chrome/browser/history/android/DEPS @@ -4,4 +4,5 @@ include_rules = [ # components/. "+chrome/browser", "+components/bookmarks/browser", + "+components/favicon/core/browser", ] diff --git a/chrome/browser/history/android/android_history_provider_service.cc b/chrome/browser/history/android/android_history_provider_service.cc index da41506..722d4e5 100644 --- a/chrome/browser/history/android/android_history_provider_service.cc +++ b/chrome/browser/history/android/android_history_provider_service.cc @@ -4,11 +4,11 @@ #include "chrome/browser/history/android/android_history_provider_service.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/android/android_provider_backend.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/android/android_history_types.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_db_task.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 8d514d4..4a46de4 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -15,7 +15,6 @@ #include "base/threading/thread.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" @@ -26,6 +25,7 @@ #include "chrome/common/pref_names.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/history_service.h" #include "components/password_manager/core/browser/password_store.h" #include "components/search_engines/template_url.h" diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 010b3b14..7745f07 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -14,7 +14,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/top_sites_factory.h" #include "chrome/browser/metrics/jumplist_metrics_win.h" @@ -27,6 +26,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_types.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/page_usage_data.h" diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc index 89f5e5e..d16c618f 100644 --- a/chrome/browser/notifications/message_center_settings_controller.cc +++ b/chrome/browser/notifications/message_center_settings_controller.cc @@ -14,7 +14,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/app_icon_loader_impl.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/notifications/desktop_notification_profile_util.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -25,6 +24,7 @@ #include "chrome/common/extensions/api/notifications.h" #include "chrome/common/extensions/extension_constants.h" #include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_types.h" #include "components/history/core/browser/history_types.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index cc110df..cc6340f 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -14,7 +14,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" @@ -25,6 +24,7 @@ #include "components/bookmarks/browser/bookmark_client.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/history_service.h" #include "content/public/browser/browser_thread.h" #include "sync/internal_api/public/change_record.h" diff --git a/chrome/browser/sync/glue/favicon_cache.cc b/chrome/browser/sync/glue/favicon_cache.cc index d2611de..1237a95 100644 --- a/chrome/browser/sync/glue/favicon_cache.cc +++ b/chrome/browser/sync/glue/favicon_cache.cc @@ -6,9 +6,9 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_service_factory.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_types.h" #include "sync/api/time.h" diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index 92cdaa9..c51e926 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -21,7 +21,6 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/chrome_bookmark_client.h" #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" @@ -35,6 +34,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_model_observer.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_util.h" #include "components/history/core/browser/history_db_task.h" #include "components/history/core/browser/history_service.h" diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc index d23655a..f7369c5 100644 --- a/chrome/browser/ui/android/navigation_popup.cc +++ b/chrome/browser/ui/android/navigation_popup.cc @@ -8,11 +8,11 @@ #include "base/android/scoped_java_ref.h" #include "base/bind.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/url_constants.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/history_types.h" #include "jni/NavigationPopup_jni.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc b/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc index b31768b..18515bb 100644 --- a/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc +++ b/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc @@ -6,13 +6,13 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/suggestions/suggestions_service_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/suggestions/proto/suggestions.pb.h" #include "components/suggestions/suggestions_service.h" #include "components/suggestions/suggestions_utils.h" diff --git a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc index d7668c5..6535b14 100644 --- a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc +++ b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc @@ -5,10 +5,10 @@ #include "chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/search/search_util.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_callback.h" #include "components/favicon_base/favicon_types.h" #include "components/suggestions/suggestions_service.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index 1af14a1..1f9cc2d 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h @@ -13,10 +13,10 @@ #include "base/memory/ref_counted.h" #include "base/scoped_observer.h" #include "base/task/cancelable_task_tracker.h" -#import "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" #import "chrome/browser/ui/cocoa/main_menu_item.h" +#import "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_service_observer.h" #include "components/sessions/session_id.h" diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index b4201e6..f0799d5 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/task/cancelable_task_tracker.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/grit/generated_resources.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_types.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h index 68dbec1..60265bba 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.h +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h @@ -12,7 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/strings/string16.h" #include "base/task/cancelable_task_tracker.h" -#include "chrome/browser/favicon/favicon_service.h" +#include "components/favicon/core/browser/favicon_service.h" #include "ui/base/models/menu_model.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h index d4a8efe..17d2818 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h @@ -10,10 +10,10 @@ #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "base/timer/elapsed_timer.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" #include "chrome/browser/sync/glue/synced_session.h" +#include "components/favicon/core/browser/favicon_service.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 4cb13b9..597d766 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -14,7 +14,6 @@ #include "chrome/browser/about_flags.h" #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/webui/about_ui.h" @@ -61,6 +60,7 @@ #include "components/dom_distiller/core/dom_distiller_service.h" #include "components/dom_distiller/core/url_constants.h" #include "components/dom_distiller/webui/dom_distiller_ui.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon_base/favicon_util.h" #include "components/favicon_base/select_favicon_frames.h" #include "components/history/core/browser/history_types.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index 2d00c56..5f25cbc 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" -#include "chrome/browser/favicon/favicon_service.h" +#include "components/favicon/core/browser/favicon_service.h" #include "content/public/browser/url_data_source.h" #include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 16c0bbd..ef4df8d 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/task/cancelable_task_tracker.h" -#include "chrome/browser/favicon/favicon_service.h" +#include "components/favicon/core/browser/favicon_service.h" #include "content/public/browser/url_data_source.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index 832108b..daf392b 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -13,9 +13,9 @@ #include "base/prefs/pref_change_registrar.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" #include "chrome/common/extensions/extension_constants.h" +#include "components/favicon/core/browser/favicon_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index a07e659..2a99911 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -11,11 +11,11 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/extension_icon_manager.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/top_sites_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/core/browser/top_sites.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 58357d1..ea84ca6 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -594,10 +594,10 @@ 'browser/push_messaging/push_messaging_permission_context.h', 'browser/push_messaging/push_messaging_permission_context_factory.cc', 'browser/push_messaging/push_messaging_permission_context_factory.h', + 'browser/push_messaging/push_messaging_service_factory.cc', + 'browser/push_messaging/push_messaging_service_factory.h', 'browser/push_messaging/push_messaging_service_impl.cc', 'browser/push_messaging/push_messaging_service_impl.h', - 'browser/push_messaging/push_messaging_service_factory.h', - 'browser/push_messaging/push_messaging_service_factory.cc', 'browser/renderer_context_menu/context_menu_content_type_factory.cc', 'browser/renderer_context_menu/context_menu_content_type_factory.h', 'browser/renderer_context_menu/context_menu_content_type_panel.cc', @@ -900,10 +900,10 @@ 'browser/download/download_shelf.h', 'browser/download/download_shelf_context_menu.cc', 'browser/download/download_shelf_context_menu.h', - 'browser/download/notification/download_notification_item.h', 'browser/download/notification/download_notification_item.cc', - 'browser/download/notification/download_notification_manager.h', + 'browser/download/notification/download_notification_item.h', 'browser/download/notification/download_notification_manager.cc', + 'browser/download/notification/download_notification_manager.h', 'browser/external_protocol/external_protocol_observer.cc', 'browser/external_protocol/external_protocol_observer.h', 'browser/feedback/feedback_profile_observer.cc', @@ -1531,15 +1531,10 @@ 'browser/favicon/chrome_favicon_client.h', 'browser/favicon/chrome_favicon_client_factory.cc', 'browser/favicon/chrome_favicon_client_factory.h', - 'browser/favicon/favicon_handler.cc', - 'browser/favicon/favicon_handler.h', - 'browser/favicon/favicon_service.cc', - 'browser/favicon/favicon_service.h', 'browser/favicon/favicon_service_factory.cc', 'browser/favicon/favicon_service_factory.h', 'browser/favicon/favicon_tab_helper.cc', 'browser/favicon/favicon_tab_helper.h', - 'browser/favicon/favicon_tab_helper_observer.h', ], 'chrome_browser_gnome_keyring_sources': [ 'browser/password_manager/native_backend_gnome_x.cc', @@ -2928,7 +2923,7 @@ '../components/components.gyp:domain_reliability', '../components/components.gyp:enhanced_bookmarks', '../components/components.gyp:favicon_base', - '../components/components.gyp:favicon_core', + '../components/components.gyp:favicon_core_browser', '../components/components.gyp:feedback_component', '../components/components.gyp:gcm_driver', '../components/components.gyp:google_core_browser', diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index a2c5cd1..d95fe15 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -21,7 +21,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/favicon/chrome_favicon_client_factory.h" -#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/chrome_history_client.h" #include "chrome/browser/history/chrome_history_client_factory.h" @@ -55,6 +54,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/common/bookmark_constants.h" #include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/history/content/browser/content_visit_delegate.h" #include "components/history/content/browser/history_database_helper.h" #include "components/history/core/browser/history_backend.h" diff --git a/components/BUILD.gn b/components/BUILD.gn index 12e023a..ed5b887 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -38,7 +38,7 @@ group("all_components") { "//components/dom_distiller/core", "//components/domain_reliability", "//components/enhanced_bookmarks", - "//components/favicon/core", + "//components/favicon/core/browser", "//components/favicon_base", "//components/feedback", "//components/gcm_driver", @@ -162,8 +162,9 @@ group("all_components") { "//components/data_reduction_proxy/core/common", # Should work, needs checking. "//components/dom_distiller/core", # Blocked on content. "//components/domain_reliability", # Blocked on content. + "//components/favicon/core/browser", # Blocked on keyed service. "//components/favicon_base", # Should work, needs checking. - "//components/favicon/core", # Blocked on keyed service. + "//components/feedback", # Blocked on content. "//components/gcm_driver", # Should work, needs checking. "//components/google/core/browser", # Should work, needs checking. "//components/history/core/browser", # Should work, needs checking. diff --git a/components/components.gyp b/components/components.gyp index bbf2571..5160960 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -27,7 +27,6 @@ 'domain_reliability.gypi', 'enhanced_bookmarks.gypi', 'error_page.gypi', - 'favicon.gypi', 'favicon_base.gypi', 'feedback.gypi', 'google.gypi', @@ -129,6 +128,7 @@ # Android WebView fails to build if a dependency on these targets is # introduced. 'includes': [ + 'favicon.gypi', 'gcm_driver.gypi', 'history.gypi', 'omnibox.gypi', diff --git a/components/favicon.gypi b/components/favicon.gypi index 262bd2b4..09a78f2 100644 --- a/components/favicon.gypi +++ b/components/favicon.gypi @@ -10,12 +10,11 @@ 'type': 'static_library', 'dependencies': [ '../ui/gfx/gfx.gyp:gfx_geometry', + '../url/url.gyp:url_lib', 'favicon_base', - 'keyed_service_core', ], 'sources': [ # Note: sources list duplicated in GN build. - 'favicon/core/browser/favicon_client.h', 'favicon/core/favicon_driver.h', 'favicon/core/favicon_url.cc', 'favicon/core/favicon_url.h', @@ -24,5 +23,32 @@ '..', ], }, + { + # GN version: //components/favicon/core/browser + 'target_name': 'favicon_core_browser', + 'type': 'static_library', + 'dependencies': [ + '../skia/skia.gyp:skia', + '../ui/gfx/gfx.gyp:gfx', + '../url/url.gyp:url_lib', + 'bookmarks_browser', + 'favicon_base', + 'favicon_core', + 'history_core_browser', + 'keyed_service_core', + ], + 'sources': [ + # Note: sources list duplicated in GN build. + 'favicon/core/browser/favicon_client.h', + 'favicon/core/browser/favicon_handler.cc', + 'favicon/core/browser/favicon_handler.h', + 'favicon/core/browser/favicon_service.cc', + 'favicon/core/browser/favicon_service.h', + 'favicon/core/browser/favicon_tab_helper_observer.h', + ], + 'include_dirs': [ + '..', + ], + }, ], } diff --git a/components/favicon/DEPS b/components/favicon/DEPS index 9b38a85..b6ea2b3 100644 --- a/components/favicon/DEPS +++ b/components/favicon/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+components/favicon_base", - "+components/keyed_service/core", - "+ui/gfx/geometry", + "+ui/gfx", ] diff --git a/components/favicon/core/BUILD.gn b/components/favicon/core/BUILD.gn index 0f834cb..05bd40b 100644 --- a/components/favicon/core/BUILD.gn +++ b/components/favicon/core/BUILD.gn @@ -4,7 +4,6 @@ static_library("core") { sources = [ - "browser/favicon_client.h", "favicon_driver.h", "favicon_url.cc", "favicon_url.h", @@ -12,7 +11,7 @@ static_library("core") { deps = [ "//components/favicon_base", - "//components/keyed_service/core", "//ui/gfx/geometry", + "//url", ] } diff --git a/components/favicon/core/browser/BUILD.gn b/components/favicon/core/browser/BUILD.gn new file mode 100644 index 0000000..22e1246 --- /dev/null +++ b/components/favicon/core/browser/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +static_library("browser") { + sources = [ + "favicon_client.h", + "favicon_handler.cc", + "favicon_handler.h", + "favicon_service.cc", + "favicon_service.h", + "favicon_tab_helper_observer.h", + ] + + deps = [ + "//components/bookmarks/browser", + "//components/favicon/core", + "//components/favicon_base", + "//components/history/core/browser", + "//components/keyed_service/core", + "//skia", + "//ui/gfx", + "//url", + ] +} diff --git a/components/favicon/core/browser/DEPS b/components/favicon/core/browser/DEPS new file mode 100644 index 0000000..8a86e5b --- /dev/null +++ b/components/favicon/core/browser/DEPS @@ -0,0 +1,7 @@ +include_rules = [ + "+components/bookmarks/browser", + "+components/history/core/browser", + "+components/keyed_service/core", + "+skia", + "+third_party/skia", +] diff --git a/chrome/browser/favicon/favicon_handler.cc b/components/favicon/core/browser/favicon_handler.cc index 9f1fe25..1cff52c 100644 --- a/chrome/browser/favicon/favicon_handler.cc +++ b/components/favicon/core/browser/favicon_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/favicon/favicon_handler.h" +#include "components/favicon/core/browser/favicon_handler.h" #include <algorithm> #include <cmath> @@ -12,8 +12,8 @@ #include "base/bind_helpers.h" #include "base/memory/ref_counted_memory.h" #include "build/build_config.h" -#include "chrome/browser/favicon/favicon_service.h" #include "components/favicon/core/browser/favicon_client.h" +#include "components/favicon/core/browser/favicon_service.h" #include "components/favicon/core/favicon_driver.h" #include "components/favicon_base/favicon_util.h" #include "components/favicon_base/select_favicon_frames.h" @@ -124,12 +124,12 @@ bool HasValidResult( // Returns the index of the entry with the largest area. int GetLargestSizeIndex(const std::vector<gfx::Size>& sizes) { DCHECK(!sizes.empty()); - int ret = 0; + size_t ret = 0; for (size_t i = 1; i < sizes.size(); ++i) { if (sizes[ret].GetArea() < sizes[i].GetArea()) ret = i; } - return ret; + return static_cast<int>(ret); } // Return the index of a size which is same as the given |size|, -1 returned if diff --git a/chrome/browser/favicon/favicon_handler.h b/components/favicon/core/browser/favicon_handler.h index b3b94d6..5d890c0 100644 --- a/chrome/browser/favicon/favicon_handler.h +++ b/components/favicon/core/browser/favicon_handler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ -#define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ +#ifndef COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_ +#define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_ #include <deque> #include <map> @@ -306,4 +306,4 @@ class FaviconHandler { DISALLOW_COPY_AND_ASSIGN(FaviconHandler); }; -#endif // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ +#endif // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_ diff --git a/chrome/browser/favicon/favicon_service.cc b/components/favicon/core/browser/favicon_service.cc index 98dadea..f0173e4 100644 --- a/chrome/browser/favicon/favicon_service.cc +++ b/components/favicon/core/browser/favicon_service.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/favicon/favicon_service.h" +#include "components/favicon/core/browser/favicon_service.h" #include <cmath> diff --git a/chrome/browser/favicon/favicon_service.h b/components/favicon/core/browser/favicon_service.h index 64eb458..4149344 100644 --- a/chrome/browser/favicon/favicon_service.h +++ b/components/favicon/core/browser/favicon_service.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_ -#define CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_ +#ifndef COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_SERVICE_H_ +#define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_SERVICE_H_ #include <vector> @@ -251,4 +251,4 @@ class FaviconService : public KeyedService { DISALLOW_COPY_AND_ASSIGN(FaviconService); }; -#endif // CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_ +#endif // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_SERVICE_H_ diff --git a/chrome/browser/favicon/favicon_tab_helper_observer.h b/components/favicon/core/browser/favicon_tab_helper_observer.h index 7e28b5e..bc109ff 100644 --- a/chrome/browser/favicon/favicon_tab_helper_observer.h +++ b/components/favicon/core/browser/favicon_tab_helper_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_OBSERVER_H_ -#define CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_OBSERVER_H_ +#ifndef COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_TAB_HELPER_OBSERVER_H_ +#define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_TAB_HELPER_OBSERVER_H_ namespace gfx { class Image; @@ -21,4 +21,4 @@ class FaviconTabHelperObserver { virtual ~FaviconTabHelperObserver() {} }; -#endif // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_OBSERVER_H_ +#endif // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_TAB_HELPER_OBSERVER_H_ |