Headers cleanup:

- reduce header dependencies by using bookmark_model_observer.h
- replace #include <iostream> by #include <iosfwd> in headers

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

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

32 files changed, 67 insertions, 28 deletions

diff --git a/base/gfx/point.cc b/base/gfx/point.cc
index 8fb958e..4fc031d 100644
--- a/base/gfx/point.cc
+++ b/base/gfx/point.cc
@@ -8,6 +8,8 @@
 #include <windows.h>
 #endif
 
+#include <iostream>
+
 namespace gfx {
 
 Point::Point() : x_(0), y_(0) {
@@ -42,3 +44,7 @@ CGPoint Point::ToCGPoint() const {
 #endif
 
 }  // namespace gfx
+
+std::ostream& operator<<(std::ostream& out, const gfx::Point& p) {
+  return out << p.x() << "," << p.y();
+}
diff --git a/base/gfx/point.h b/base/gfx/point.h
index 377efb1..7f95096 100644
--- a/base/gfx/point.h
+++ b/base/gfx/point.h
@@ -7,7 +7,7 @@
 
 #include "build/build_config.h"
 
-#include <iostream>
+#include <iosfwd>
 
 #if defined(OS_WIN)
 typedef struct tagPOINT POINT;
@@ -70,8 +70,6 @@ class Point {
 
 }  // namespace gfx
 
-inline std::ostream& operator<<(std::ostream& out, const gfx::Point& p) {
-  return out << p.x() << "," << p.y();
-}
+std::ostream& operator<<(std::ostream& out, const gfx::Point& p);
 
 #endif // BASE_GFX_POINT_H__
diff --git a/base/gfx/rect.cc b/base/gfx/rect.cc
index e0226f3..1e067e7 100644
--- a/base/gfx/rect.cc
+++ b/base/gfx/rect.cc
@@ -12,6 +12,8 @@
 #include <gdk/gdk.h>
 #endif
 
+#include <iostream>
+
 #include "base/logging.h"
 
 namespace {
@@ -224,3 +226,7 @@ Point Rect::CenterPoint() const {
 }
 
 }  // namespace gfx
+
+std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
+  return out << r.origin() << " " << r.size();
+}
diff --git a/base/gfx/rect.h b/base/gfx/rect.h
index 6da1b55..f944dd7 100644
--- a/base/gfx/rect.h
+++ b/base/gfx/rect.h
@@ -12,7 +12,7 @@
 #ifndef BASE_GFX_RECT_H__
 #define BASE_GFX_RECT_H__
 
-#include <iostream>
+#include <iosfwd>
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
@@ -155,8 +155,6 @@ class Rect {
 
 }  // namespace gfx
 
-inline std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
-  return out << r.origin() << " " << r.size();
-}
+std::ostream& operator<<(std::ostream& out, const gfx::Rect& r);
 
 #endif  // BASE_GFX_RECT_H__
diff --git a/base/gfx/size.cc b/base/gfx/size.cc
index 018a42c..76dc023 100644
--- a/base/gfx/size.cc
+++ b/base/gfx/size.cc
@@ -10,8 +10,9 @@
 #include <CoreGraphics/CGGeometry.h>
 #endif
 
-#include "base/logging.h"
+#include <iostream>
 
+#include "base/logging.h"
 
 namespace gfx {
 
@@ -49,5 +50,8 @@ void Size::set_height(int height) {
   height_ = height;
 }
 
-
 }  // namespace gfx
+
+std::ostream& operator<<(std::ostream& out, const gfx::Size& s) {
+  return out << s.width() << "x" << s.height();
+}
diff --git a/base/gfx/size.h b/base/gfx/size.h
index 57e080b..3e74e80 100644
--- a/base/gfx/size.h
+++ b/base/gfx/size.h
@@ -7,7 +7,7 @@
 
 #include "build/build_config.h"
 
-#include <iostream>
+#include <iosfwd>
 
 #if defined(OS_WIN)
 typedef struct tagSIZE SIZE;
@@ -71,8 +71,6 @@ class Size {
 
 }  // namespace gfx
 
-inline std::ostream& operator<<(std::ostream& out, const gfx::Size& s) {
-  return out << s.width() << "x" << s.height();
-}
+std::ostream& operator<<(std::ostream& out, const gfx::Size& s);
 
 #endif  // BASE_GFX_SIZE_H_
diff --git a/chrome/browser/bookmarks/base_bookmark_model_observer.h b/chrome/browser/bookmarks/base_bookmark_model_observer.h
index 1242d18..8018b72 100644
--- a/chrome/browser/bookmarks/base_bookmark_model_observer.h
+++ b/chrome/browser/bookmarks/base_bookmark_model_observer.h
@@ -5,7 +5,8 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BASE_BOOKMARK_MODEL_OBSERVER_H_
 #define CHROME_BROWSER_BOOKMARKS_BASE_BOOKMARK_MODEL_OBSERVER_H_
 
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "base/basictypes.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 
 // Base class for a BookmarkModelObserver implementation. All mutations of the
 // model funnel into the method BookmarkModelChanged.
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
index b04379a..eedffb1 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
@@ -6,8 +6,10 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 BookmarkFolderTreeModel::BookmarkFolderTreeModel(BookmarkModel* model)
     : TreeNodeModel<FolderNode>(new FolderNode(NULL)),
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.h b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
index fb88e1c..6f1d713 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.h
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "app/tree_node_model.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 
 // The type of nodes created by BookmarkFolderTreeModel.
 typedef TreeNodeWithValue<const BookmarkNode*> FolderNode;
diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc
index f8d8615..052497b 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model.cc
@@ -11,6 +11,7 @@
 #include "app/table_model_observer.h"
 #include "base/string_util.h"
 #include "base/time_format.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/bookmarks/bookmark_table_model.h b/chrome/browser/bookmarks/bookmark_table_model.h
index 997d7f0..4bc4fed 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.h
+++ b/chrome/browser/bookmarks/bookmark_table_model.h
@@ -7,7 +7,7 @@
 
 #include "app/table_model.h"
 #include "build/build_config.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 
 // BookmarkTableModel provides a view of the BookmarkModel as a TableModel.
 // Three variations are provided:
diff --git a/chrome/browser/cocoa/bookmark_bar_bridge.h b/chrome/browser/cocoa/bookmark_bar_bridge.h
index 114197d..269bbad 100644
--- a/chrome/browser/cocoa/bookmark_bar_bridge.h
+++ b/chrome/browser/cocoa/bookmark_bar_bridge.h
@@ -11,7 +11,8 @@
 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_BRIDGE_H_
 #define CHROME_BROWSER_COCOA_BOOKMARK_BAR_BRIDGE_H_
 
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "base/basictypes.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 
 class Browser;
 @class BookmarkBarController;
diff --git a/chrome/browser/cocoa/bookmark_bar_bridge.mm b/chrome/browser/cocoa/bookmark_bar_bridge.mm
index c28fe82..5fd6fe9 100644
--- a/chrome/browser/cocoa/bookmark_bar_bridge.mm
+++ b/chrome/browser/cocoa/bookmark_bar_bridge.mm
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/cocoa/bookmark_bar_bridge.h"
+
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/cocoa/bookmark_bar_controller.h"
 
 BookmarkBarBridge::BookmarkBarBridge(BookmarkBarController* controller,
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.h b/chrome/browser/cocoa/bookmark_bar_controller.h
index 67ecf67..40ea772 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.h
+++ b/chrome/browser/cocoa/bookmark_bar_controller.h
@@ -8,6 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/cocoa/bookmark_bar_bridge.h"
 #include "webkit/glue/window_open_disposition.h"
 
@@ -15,6 +16,7 @@
 class BookmarkModel;
 class BookmarkNode;
 @class BookmarkBarView;
+class GURL;
 class Profile;
 class PrefService;
 
diff --git a/chrome/browser/cocoa/bookmark_menu_bridge.h b/chrome/browser/cocoa/bookmark_menu_bridge.h
index 345c98a..a69ce63 100644
--- a/chrome/browser/cocoa/bookmark_menu_bridge.h
+++ b/chrome/browser/cocoa/bookmark_menu_bridge.h
@@ -20,7 +20,7 @@
 #ifndef CHROME_BROWSER_COCOA_BOOKMARK_MENU_BRIDGE_H_
 #define CHROME_BROWSER_COCOA_BOOKMARK_MENU_BRIDGE_H_
 
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/browser_list.h"
 
 class Browser;
diff --git a/chrome/browser/cocoa/bookmark_menu_bridge.mm b/chrome/browser/cocoa/bookmark_menu_bridge.mm
index 32618d9..f4d4c7d 100644
--- a/chrome/browser/cocoa/bookmark_menu_bridge.mm
+++ b/chrome/browser/cocoa/bookmark_menu_bridge.mm
@@ -7,6 +7,7 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_BOOKMARK_MENU
 #import "chrome/browser/app_controller_mac.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
index 25b2b4c..a62103f 100644
--- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
+++ b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
+
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #import "chrome/browser/cocoa/bookmark_menu_bridge.h"
-#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "webkit/glue/window_open_disposition.h"  // CURRENT_TAB
diff --git a/chrome/browser/cocoa/browser_window.mm b/chrome/browser/cocoa/browser_window.mm
index 0268dc6..1ecce65 100644
--- a/chrome/browser/cocoa/browser_window.mm
+++ b/chrome/browser/cocoa/browser_window.mm
@@ -4,6 +4,7 @@
 
 #import "chrome/browser/cocoa/browser_window.h"
 
+#include "base/logging.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 
diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/extensions/extension_bookmarks_module.h
index 853a0aa..c9301eb 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.h
+++ b/chrome/browser/extensions/extension_bookmarks_module.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/singleton.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index c8f9cc6..4eb07d4 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -12,6 +12,7 @@
 #include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/bookmark_context_menu.h"
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index 0683275..626c5eb0 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -10,7 +10,8 @@
 #include <string>
 
 #include "app/slide_animation.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "base/scoped_ptr.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
diff --git a/chrome/browser/gtk/bookmark_context_menu.h b/chrome/browser/gtk/bookmark_context_menu.h
index db601c9..940dd2b 100644
--- a/chrome/browser/gtk/bookmark_context_menu.h
+++ b/chrome/browser/gtk/bookmark_context_menu.h
@@ -9,7 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "base/scoped_ptr.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 
 // TODO(port): Port this file.
 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
@@ -22,6 +23,7 @@
 
 class Browser;
 class PageNavigator;
+class Profile;
 
 // BookmarkContextMenu manages the context menu shown for the
 // bookmark bar, items on the bookmark bar, submenus of the bookmark bar and
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index 01a8459..c4ccb70 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -13,6 +13,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/gtk/bookmark_tree_model.h"
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.h b/chrome/browser/gtk/bookmark_editor_gtk.h
index 0b1fa28..3cf4c46 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.h
+++ b/chrome/browser/gtk/bookmark_editor_gtk.h
@@ -7,8 +7,14 @@
 
 #include <gtk/gtk.h>
 
+#include <string>
+
+#include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
+
+class GURL;
 
 // GTK version of the bookmark editor dialog.
 class BookmarkEditorGtk : public BookmarkEditor,
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index e3934b7..6fdbe0a 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -13,6 +13,7 @@
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_manager.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gtk/bookmark_tree_model.h"
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.h b/chrome/browser/gtk/bookmark_manager_gtk.h
index 9f621a0c..0d4968d2 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.h
+++ b/chrome/browser/gtk/bookmark_manager_gtk.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/gtk/bookmark_context_menu.h"
 #include "chrome/browser/shell_dialogs.h"
 
diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
index 7e1968d..0691cbf 100644
--- a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
@@ -10,6 +10,7 @@
 #include "app/resource_bundle.h"
 #include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/gtk/bookmark_context_menu.h"
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.h b/chrome/browser/gtk/bookmark_menu_controller_gtk.h
index 63788f1..7c5cc5f 100644
--- a/chrome/browser/gtk/bookmark_menu_controller_gtk.h
+++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.h
@@ -16,6 +16,7 @@
 
 class BookmarkContextMenu;
 class Browser;
+class Profile;
 class Profiler;
 class PageNavigator;
 class BookmarkModel;
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 39fc721..a51f948 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -7,7 +7,7 @@
 
 #include "app/slide_animation.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/views/bookmark_menu_controller_views.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 9001d2b..e20dca6 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 98f5269..0896b16 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -9,12 +9,13 @@
 
 #include "app/tree_node_model.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/simple_menu_model.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/tree/tree_view.h"
 #include "views/window/dialog_delegate.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace views {
 class NativeButton;
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index c3d7346..59bdc94 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -7,7 +7,7 @@
 
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/views/bookmark_context_menu.h"
 #include "views/controls/menu/view_menu_delegate.h"