Header cleanup in browser/importer

- forward declare more things
- move bits from header to implementation files to cut includes
- extract bookmark_model_observer.h out of bookmark_model.h to reduce includes

Review URL: http://codereview.chromium.org/159097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21116 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 57 insertions, 48 deletions

diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 4157089..760c7b6 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -14,6 +14,7 @@
 #include "base/lock.h"
 #include "base/observer_list.h"
 #include "base/waitable_event.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -156,54 +157,6 @@ class BookmarkNode : public TreeNode<BookmarkNode> {
   DISALLOW_COPY_AND_ASSIGN(BookmarkNode);
 };
 
-// BookmarkModelObserver ------------------------------------------------------
-
-// Observer for the BookmarkModel.
-//
-class BookmarkModelObserver {
- public:
-  // Invoked when the model has finished loading.
-  virtual void Loaded(BookmarkModel* model) = 0;
-
-  // Invoked from the destructor of the BookmarkModel.
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) { }
-
-  // Invoked when a node has moved.
-  virtual void BookmarkNodeMoved(BookmarkModel* model,
-                                 const BookmarkNode* old_parent,
-                                 int old_index,
-                                 const BookmarkNode* new_parent,
-                                 int new_index) = 0;
-
-  // Invoked when a node has been added.
-  virtual void BookmarkNodeAdded(BookmarkModel* model,
-                                 const BookmarkNode* parent,
-                                 int index) = 0;
-
-  // Invoked when a node has been removed, the item may still be starred though.
-  // |parent| the parent of the node that was removed.
-  // |old_index| the index of the removed node in |parent| before it was
-  // removed.
-  // |node| is the node that was removed.
-  virtual void BookmarkNodeRemoved(BookmarkModel* model,
-                                   const BookmarkNode* parent,
-                                   int old_index,
-                                   const BookmarkNode* node) = 0;
-
-  // Invoked when the title or favicon of a node has changed.
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) = 0;
-
-  // Invoked when a favicon has finished loading.
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
-                                         const BookmarkNode* node) = 0;
-
-  // Invoked when the children (just direct children, not descendants) of
-  // |node| have been reordered in some way, such as sorted.
-  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) = 0;
-};
-
 // BookmarkModel --------------------------------------------------------------
 
 // BookmarkModel provides a directed acyclic graph of the starred entries
diff --git a/chrome/browser/bookmarks/bookmark_model_observer.h b/chrome/browser/bookmarks/bookmark_model_observer.h
new file mode 100644
index 0000000..1b85fe3
--- /dev/null
+++ b/chrome/browser/bookmarks/bookmark_model_observer.h
@@ -0,0 +1,56 @@
+// Copyright (c) 2009 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.
+
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_H_
+
+class BookmarkModel;
+class BookmarkNode;
+
+// Observer for the BookmarkModel.
+class BookmarkModelObserver {
+ public:
+  // Invoked when the model has finished loading.
+  virtual void Loaded(BookmarkModel* model) = 0;
+
+  // Invoked from the destructor of the BookmarkModel.
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) { }
+
+  // Invoked when a node has moved.
+  virtual void BookmarkNodeMoved(BookmarkModel* model,
+                                 const BookmarkNode* old_parent,
+                                 int old_index,
+                                 const BookmarkNode* new_parent,
+                                 int new_index) = 0;
+
+  // Invoked when a node has been added.
+  virtual void BookmarkNodeAdded(BookmarkModel* model,
+                                 const BookmarkNode* parent,
+                                 int index) = 0;
+
+  // Invoked when a node has been removed, the item may still be starred though.
+  // |parent| the parent of the node that was removed.
+  // |old_index| the index of the removed node in |parent| before it was
+  // removed.
+  // |node| is the node that was removed.
+  virtual void BookmarkNodeRemoved(BookmarkModel* model,
+                                   const BookmarkNode* parent,
+                                   int old_index,
+                                   const BookmarkNode* node) = 0;
+
+  // Invoked when the title or favicon of a node has changed.
+  virtual void BookmarkNodeChanged(BookmarkModel* model,
+                                   const BookmarkNode* node) = 0;
+
+  // Invoked when a favicon has finished loading.
+  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+                                         const BookmarkNode* node) = 0;
+
+  // Invoked when the children (just direct children, not descendants) of
+  // |node| have been reordered in some way, such as sorted.
+  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                             const BookmarkNode* node) = 0;
+};
+
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_H_