Split out the views table functions into separate header files. Many users only

need either the view or model observers and that's it.

I moved the model constructors to a .cc file so we don't have to include
l10n_util.h for everybody. A surprising number of files were getting l10n_util
from the table code, so I had to add it in a bunch of places.

There should be no code change except I made the table column cosntructors take
wstring references instead of copies.
Review URL: http://codereview.chromium.org/115969

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

20 files changed, 44 insertions, 11 deletions

diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc
index 85d4032..53e712e 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model.cc
@@ -20,6 +20,10 @@
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 
+#if defined(TOOLKIT_VIEWS)
+#include "views/controls/table/table_model_observer.h"
+#endif
+
 namespace {
 
 // Number of bookmarks shown in recently bookmarked.
diff --git a/chrome/browser/bookmarks/bookmark_table_model.h b/chrome/browser/bookmarks/bookmark_table_model.h
index 77ad787..7832f35 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.h
+++ b/chrome/browser/bookmarks/bookmark_table_model.h
@@ -5,13 +5,12 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_TABLE_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_TABLE_MODEL_H_
 
-#include "chrome/browser/bookmarks/bookmark_model.h"
-
 #include "build/build_config.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 
-#if defined(OS_WIN)
-#include "views/controls/table/table_view.h"
-#elif defined(OS_POSIX)
+#if defined(TOOLKIT_VIEWS)
+#include "views/controls/table/table_model.h"
+#else
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
 
diff --git a/chrome/browser/task_manager_win.cc b/chrome/browser/task_manager_win.cc
index 7fc7492..3f8c8dd 100644
--- a/chrome/browser/task_manager_win.cc
+++ b/chrome/browser/task_manager_win.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/task_manager.h"
 
+#include "app/l10n_util.h"
 #include "base/stats_table.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_list.h"
@@ -19,6 +20,7 @@
 #include "views/controls/link.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/table/group_table_view.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/dialog_delegate.h"
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 1a8293fc..2852b33 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -8,6 +8,7 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
+#include "app/l10n_util.h"
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index a6ee77c96..12706fd 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -11,7 +11,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "views/controls/menu/view_menu_delegate.h"
-#include "views/controls/table/table_view.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/tree/tree_view.h"
 #include "views/view.h"
diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc
index a0236bf..8a74777 100644
--- a/chrome/browser/views/bookmark_table_view.cc
+++ b/chrome/browser/views/bookmark_table_view.cc
@@ -9,6 +9,7 @@
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
+#include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/base_drag_source.h"
@@ -19,6 +20,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/view_constants.h"
 
 namespace {
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index adc08d5..de96a8e 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/hung_renderer_dialog.h"
 
 #include "app/gfx/canvas.h"
+#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index d17056d..d21b314 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -28,6 +28,7 @@
 #include "views/background.h"
 #include "views/grid_layout.h"
 #include "views/controls/button/native_button.h"
+#include "views/controls/table/table_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index ef8b456..8b093c7 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/chrome/browser/views/keyword_editor_view.h
@@ -10,7 +10,8 @@
 
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "views/controls/button/button.h"
-#include "views/controls/table/table_view.h"
+#include "views/controls/table/table_model.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
 
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index aa3974b..792370ba 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -13,6 +13,7 @@
 #include <vssym32.h>
 
 #include "app/gfx/canvas.h"
+#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index 797ae34..30b1e9d 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -23,6 +23,7 @@
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/button/native_button.h"
+#include "views/controls/table/table_model.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/standard_layout.h"
diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
index 521dc7f..997841d 100644
--- a/chrome/browser/views/options/cookies_view.h
+++ b/chrome/browser/views/options/cookies_view.h
@@ -7,16 +7,20 @@
 
 #include "base/task.h"
 #include "views/controls/button/button.h"
-#include "views/controls/table/table_view.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 namespace views {
+
 class Label;
 class NativeButton;
-}
+class TableView;
+
+}  // namespace views
+
 class CookieInfoView;
 class CookiesTableModel;
 class CookiesTableView;
diff --git a/chrome/browser/views/options/exceptions_page_view.h b/chrome/browser/views/options/exceptions_page_view.h
index e0abe67..7a2906b 100644
--- a/chrome/browser/views/options/exceptions_page_view.h
+++ b/chrome/browser/views/options/exceptions_page_view.h
@@ -7,6 +7,7 @@
 
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/views/options/passwords_page_view.h"
+#include "views/controls/table/table_view_observer.h"
 
 class Profile;
 
diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h
index 077c2f3..a75fb99 100644
--- a/chrome/browser/views/options/general_page_view.h
+++ b/chrome/browser/views/options/general_page_view.h
@@ -10,6 +10,7 @@
 #include "chrome/common/pref_member.h"
 #include "views/controls/combo_box.h"
 #include "views/controls/button/button.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 817bdac..48932f9 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -31,6 +31,9 @@
 #include "views/controls/button/radio_button.h"
 #include "views/controls/combo_box.h"
 #include "views/controls/tabbed_pane.h"
+#include "views/controls/table/table_model.h"
+#include "views/controls/table/table_model_observer.h"
+#include "views/controls/table/table_view.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h
index 308df34..b0ad138 100644
--- a/chrome/browser/views/options/languages_page_view.h
+++ b/chrome/browser/views/options/languages_page_view.h
@@ -9,7 +9,7 @@
 #include "chrome/common/pref_member.h"
 #include "views/controls/combo_box.h"
 #include "views/controls/button/button.h"
-#include "views/controls/table/table_view.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h
index 2fd9e46..35cb31e 100644
--- a/chrome/browser/views/options/passwords_page_view.h
+++ b/chrome/browser/views/options/passwords_page_view.h
@@ -15,6 +15,8 @@
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/table/table_view.h"
+#include "views/controls/table/table_model.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index 0b68634..c80f991 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -21,6 +21,9 @@
 #include "net/base/net_util.h"
 #include "views/background.h"
 #include "views/controls/label.h"
+#include "views/controls/table/table_model.h"
+#include "views/controls/table/table_model_observer.h"
+#include "views/controls/table/table_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/focus/focus_manager.h"
 #include "views/grid_layout.h"
diff --git a/chrome/browser/views/shelf_item_dialog.h b/chrome/browser/views/shelf_item_dialog.h
index 73a85ef..8f5953a 100644
--- a/chrome/browser/views/shelf_item_dialog.h
+++ b/chrome/browser/views/shelf_item_dialog.h
@@ -8,7 +8,7 @@
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
 #include "views/controls/button/native_button.h"
-#include "views/controls/table/table_view.h"
+#include "views/controls/table/table_view_observer.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
@@ -17,6 +17,7 @@
 namespace views {
 class Button;
 class Label;
+class TableView;
 }
 
 class PossibleURLModel;
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 1f6617b..f17b24e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1358,8 +1358,13 @@
         'browser/views/bookmark_menu_button.h',
         'browser/views/bookmark_menu_controller_views.cc',
         'browser/views/bookmark_menu_controller_views.h',
+        'browser/views/bookmark_table_model.cc',
+        'browser/views/bookmark_table_model.h',
+        'browser/views/bookmark_table_model_observer.h',
         'browser/views/bookmark_table_view.cc',
         'browser/views/bookmark_table_view.h',
+        'browser/views/bookmark_table_view_observer.h',
+        'browser/views/bookmark_table_observer.h',
         'browser/views/browser_bubble.cc',
         'browser/views/browser_bubble.h',
         'browser/views/browser_bubble_gtk.cc',