Converting the Cookies options page from a TableView to a TreeView...

chrome/browser/views/options/cookies_view.h

Index: chrome/browser/views/options/cookies_view.h
===================================================================
--- chrome/browser/views/options/cookies_view.h	(revision 31154)
+++ chrome/browser/views/options/cookies_view.h	(working copy)
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
 
+#include <string>
+
 #include "base/task.h"
+#include "net/base/cookie_monster.h"
 #include "views/controls/button/button.h"
-#include "views/controls/table/table_view_observer.h"
+#include "views/controls/tree/tree_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
@@ -17,53 +20,42 @@
 
 class Label;
 class NativeButton;
-class TableView;
 
 }  // namespace views
 
+
 class CookieInfoView;
-class CookiesTableModel;
-class CookiesTableView;
+class CookiesTreeModel;
+class CookiesTreeView;
 class Profile;
 class Timer;
 
+
 class CookiesView : public views::View,
                     public views::DialogDelegate,
                     public views::ButtonListener,
-                    public views::TableViewObserver,
-                    public views::Textfield::Controller {
+                    public views::TreeViewController {
  public:
   // Show the Cookies Window, creating one if necessary.
   static void ShowCookiesWindow(Profile* profile);
 
   virtual ~CookiesView();
 
-  // Updates the display to show only the search results.
-  void UpdateSearchResults();
-
   // views::ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
-  // views::TableViewObserver implementation.
-  virtual void OnSelectionChanged();
+  // views::TreeViewController implementation.
+  virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
 
-  // Invoked when the user presses the delete key. Deletes the selected
-  // cookies.
-  virtual void OnTableViewDelete(views::TableView* table_view);
+  // views::TreeViewController implementation.
+  virtual void OnTreeViewKeyDown(base::KeyboardCode keycode);
 
-  // views::Textfield::Controller implementation.
-  virtual void ContentsChanged(views::Textfield* sender,
-                               const std::wstring& new_contents);
-  virtual bool HandleKeystroke(views::Textfield* sender,
-                               const views::Textfield::Keystroke& key);
-
   // views::WindowDelegate implementation.
   virtual int GetDialogButtons() const {
     return MessageBoxFlags::DIALOGBUTTON_CANCEL;
   }
-  virtual views::View* GetInitiallyFocusedView() {
-    return search_field_;
-  }
+  virtual views::View* GetInitiallyFocusedView();
+
   virtual bool CanResize() const { return true; }
   virtual std::wstring GetWindowTitle() const;
   virtual void WindowClosing();
@@ -86,32 +78,22 @@
   // Initialize the dialog contents and layout.
   void Init();
 
-  // Resets the display to what it would be if there were no search query.
-  void ResetSearchQuery();
-
   // Update the UI when there are no cookies.
   void UpdateForEmptyState();
 
   // Assorted dialog controls
-  views::Label* search_label_;
-  views::Textfield* search_field_;
-  views::NativeButton* clear_search_button_;
   views::Label* description_label_;
-  CookiesTableView* cookies_table_;
+  CookiesTreeView* cookies_tree_;
   CookieInfoView* info_view_;
   views::NativeButton* remove_button_;
   views::NativeButton* remove_all_button_;
 
-  // The Cookies Table model
-  scoped_ptr<CookiesTableModel> cookies_table_model_;
+  // The Cookies Tree model
+  scoped_ptr<CookiesTreeModel> cookies_tree_model_;
 
   // The Profile for which Cookies are displayed
   Profile* profile_;
 
-  // A factory to construct Runnable Methods so that we can be called back to
-  // re-evaluate the model after the search query string changes.
-  ScopedRunnableMethodFactory<CookiesView> search_update_factory_;
-
   // Our containing window. If this is non-NULL there is a visible Cookies
   // window somewhere.
   static views::Window* instance_;
@@ -119,4 +101,53 @@
   DISALLOW_COPY_AND_ASSIGN(CookiesView);
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// CookieInfoView
+//
+//  Responsible for displaying a tabular grid of Cookie information.
+class CookieInfoView : public views::View {
+ public:
+  CookieInfoView();
+  virtual ~CookieInfoView();
+
+  // Update the display from the specified CookieNode.
+  void SetCookie(const std::string& domain,
+                 const net::CookieMonster::CanonicalCookie& cookie_node);
+
+  // Clears the cookie display to indicate that no or multiple cookies are
+  // selected.
+  void ClearCookieDisplay();
+
+  // Enables or disables the cookie proerty text fields.
+  void EnableCookieDisplay(bool enabled);
+
+ protected:
+  // views::View overrides:
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    views::View* parent,
+                                    views::View* child);
+
+ private:
+  // Set up the view layout
+  void Init();
+
+  // Individual property labels
+  views::Label* name_label_;
+  views::Textfield* name_value_field_;
+  views::Label* content_label_;
+  views::Textfield* content_value_field_;
+  views::Label* domain_label_;
+  views::Textfield* domain_value_field_;
+  views::Label* path_label_;
+  views::Textfield* path_value_field_;
+  views::Label* send_for_label_;
+  views::Textfield* send_for_value_field_;
+  views::Label* created_label_;
+  views::Textfield* created_value_field_;
+  views::Label* expires_label_;
+  views::Textfield* expires_value_field_;
+
+  DISALLOW_COPY_AND_ASSIGN(CookieInfoView);
+};
+
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_