diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 00:46:34 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 00:46:34 +0000 |
commit | dfad18be78e099d61120b44ebaafa236fc5f8be0 (patch) | |
tree | d6b7b3b7b9208e48cc0bc95b72bf9b557de59ae6 | |
parent | da7374f55cd65084a312237fac4f540f15900a3c (diff) | |
download | chromium_src-dfad18be78e099d61120b44ebaafa236fc5f8be0.zip chromium_src-dfad18be78e099d61120b44ebaafa236fc5f8be0.tar.gz chromium_src-dfad18be78e099d61120b44ebaafa236fc5f8be0.tar.bz2 |
bookmarks: Forward declare FaviconImageResult in bookmark_model.h
BUG=144783
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11647026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174295 0039d316-1c4b-4281-b951-d872f2087c98
10 files changed, 16 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_index.cc b/chrome/browser/bookmarks/bookmark_index.cc index 6b21f03..31ae047 100644 --- a/chrome/browser/bookmarks/bookmark_index.cc +++ b/chrome/browser/bookmarks/bookmark_index.cc @@ -12,6 +12,7 @@ #include "base/string16.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/query_parser.h" diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index c9cfaa6..26bba01 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -14,6 +14,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/in_memory_database.h" diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 9d5fc07..78a4036 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/json/json_string_value_serializer.h" -#include "base/memory/scoped_vector.h" #include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "base/values.h" @@ -20,7 +19,9 @@ #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_storage.h" #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/history/history_notifications.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index d47e74e..3012847 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -17,10 +17,9 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/api/bookmarks/bookmark_service.h" -#include "chrome/browser/favicon/favicon_service.h" -#include "chrome/browser/history/history.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/common/cancelable_task_tracker.h" +#include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" #include "ui/base/models/tree_node_model.h" @@ -38,6 +37,10 @@ namespace bookmark_utils { struct TitleMatch; } +namespace history { +struct FaviconImageResult; +} + // BookmarkNode --------------------------------------------------------------- // BookmarkNode contains information about a starred entry: title, URL, favicon, diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index dd76fd1..38dafb61 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -22,6 +22,7 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/history/history_notifications.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index 7ac14cd..b9f7a47 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -5,6 +5,7 @@ #include "chrome/browser/importer/importer_host.h" #include "base/bind.h" +#include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index ae536fb..d009d2f 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -14,7 +14,9 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.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.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_factory.h" diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index d7f2f71..b55d279 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -17,6 +17,7 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc index 9fc38d2..5aef212 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc @@ -11,6 +11,7 @@ #include "base/message_loop.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc index ca45a01..95a4817 100644 --- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc @@ -9,6 +9,7 @@ #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" +#include "ui/base/layout.h" using bookmarks_helper::AddFolder; using bookmarks_helper::AddURL; |