summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/bookmarks/bookmark_storage.cc1
-rw-r--r--chrome/browser/bookmarks/bookmark_storage.h2
-rw-r--r--chrome/browser/bookmarks/recently_used_folders_combo_model.h7
-rw-r--r--chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc1
4 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index d5aa1fd..c4dee86 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -13,6 +13,7 @@
#include "base/metrics/histogram.h"
#include "base/time.h"
#include "chrome/browser/bookmarks/bookmark_codec.h"
+#include "chrome/browser/bookmarks/bookmark_index.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/startup_metric_utils.h"
diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h
index e773df2..a8dca16 100644
--- a/chrome/browser/bookmarks/bookmark_storage.h
+++ b/chrome/browser/bookmarks/bookmark_storage.h
@@ -8,8 +8,8 @@
#include "base/files/important_file_writer.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/bookmarks/bookmark_index.h"
+class BookmarkIndex;
class BookmarkModel;
class BookmarkPermanentNode;
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
index 96666ff..f446af7 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
@@ -7,10 +7,13 @@
#include <vector>
-#include "base/string16.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "ui/base/models/combobox_model.h"
+class BookmarkModel;
+class BookmarkNode;
+
// Model for the combobox showing the list of folders to choose from. The
// list always contains the bookmark bar, other node and parent. The list
// also contains an extra item that shows the text 'Choose another folder...'.
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc
index 1e0cf7b..4e72c2e 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -6,6 +6,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread.h"