[Views] Hook up the "Remove" button in the collected cookies dialog.

chrome/browser/ui/views/collected_cookies_views.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/collected_cookies_views.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
@@ skipping 181 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, public:
 
 CollectedCookiesViews::CollectedCookiesViews(content::WebContents* web_contents)
     : web_contents_(web_contents),
       allowed_label_(NULL),
       blocked_label_(NULL),
       allowed_cookies_tree_(NULL),
       blocked_cookies_tree_(NULL),
       block_allowed_button_(NULL),
+      delete_allowed_button_(NULL),
       allow_blocked_button_(NULL),
       for_session_blocked_button_(NULL),
       cookie_info_view_(NULL),
       infobar_(NULL),
       status_changed_(false) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  content::Source<TabSpecificContentSettings>(content_settings));
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
@@ skipping 50 matching lines @@
 #else
   return views::WidgetDelegate::GetModalType();
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, views::ButtonListener implementation:
 
 void CollectedCookiesViews::ButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
-  if (sender == block_allowed_button_)
+  if (sender == block_allowed_button_) {
     AddContentException(allowed_cookies_tree_, CONTENT_SETTING_BLOCK);
-  else if (sender == allow_blocked_button_)
+  } else if (sender == delete_allowed_button_) {
+    allowed_cookies_tree_model_->DeleteCookieNode(
+        static_cast<CookieTreeNode*>(allowed_cookies_tree_->GetSelectedNode()));
+  } else if (sender == allow_blocked_button_) {
     AddContentException(blocked_cookies_tree_, CONTENT_SETTING_ALLOW);
-  else if (sender == for_session_blocked_button_)
+  } else if (sender == for_session_blocked_button_) {
     AddContentException(blocked_cookies_tree_, CONTENT_SETTING_SESSION_ONLY);
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, views::TabbedPaneListener implementation:
 
 void CollectedCookiesViews::TabSelectedAt(int index) {
   EnableControls();
   ShowCookieInfo();
 }
 
@@ skipping 83 matching lines @@
   allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get());
   allowed_cookies_tree_->SetRootShown(false);
   allowed_cookies_tree_->SetEditable(false);
   allowed_cookies_tree_->set_auto_expand_children(true);
   allowed_cookies_tree_->SetController(this);
 
   block_allowed_button_ = new views::LabelButton(this,
       l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_BLOCK_BUTTON));
   block_allowed_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
 
+  delete_allowed_button_ = new views::LabelButton(this,
+      l10n_util::GetStringUTF16(IDS_COOKIES_REMOVE_LABEL));
+  delete_allowed_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+
   // Create the view that holds all the controls together.  This will be the
   // pane added to the tabbed pane.
   using views::GridLayout;
 
   views::View* pane = new views::View();
   GridLayout* layout = GridLayout::CreatePanel(pane);
   layout->SetInsets(kVPanelPadding, views::kButtonHEdgeMarginNew,
                     kVPanelPadding, views::kButtonHEdgeMarginNew);
   pane->SetLayoutManager(layout);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
+  const int three_columns_layout_id = 1;
+  column_set = layout->AddColumnSet(three_columns_layout_id);
+  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
+                        GridLayout::USE_PREF, 0, 0);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
+  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
+                        GridLayout::USE_PREF, 0, 0);
+
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(allowed_label_);
   layout->AddPaddingRow(0, kLabelBottomPadding);
 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(CreateScrollView(allowed_cookies_tree_), 1, 1,
                   GridLayout::FILL, GridLayout::FILL, kTreeViewWidth,
                   kTreeViewHeight);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
-  layout->StartRow(0, single_column_layout_id);
-  layout->AddView(block_allowed_button_, 1, 1, GridLayout::LEADING,
-                  GridLayout::CENTER);
+  layout->StartRow(0, three_columns_layout_id);
+  layout->AddView(block_allowed_button_);
+  layout->AddView(delete_allowed_button_);
 
   return pane;
 }
 
 views::View* CollectedCookiesViews::CreateBlockedPane() {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents_);
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
@@ skipping 77 matching lines @@
   ui::TreeModelNode* node = allowed_cookies_tree_->GetSelectedNode();
   if (node) {
     CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node);
     if (cookie_node->GetDetailedInfo().node_type ==
         CookieTreeNode::DetailedInfo::TYPE_HOST) {
       enable_allowed_buttons = static_cast<CookieTreeHostNode*>(
           cookie_node)->CanCreateContentException();
     }
   }
   block_allowed_button_->SetEnabled(enable_allowed_buttons);
+  delete_allowed_button_->SetEnabled(node != NULL);
 
   bool enable_blocked_buttons = false;
   node = blocked_cookies_tree_->GetSelectedNode();
   if (node) {
     CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node);
     if (cookie_node->GetDetailedInfo().node_type ==
         CookieTreeNode::DetailedInfo::TYPE_HOST) {
       enable_blocked_buttons = static_cast<CookieTreeHostNode*>(
           cookie_node)->CanCreateContentException();
     }
@@ skipping 38 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, content::NotificationObserver implementation:
 
 void CollectedCookiesViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);
   window_->Close();
 }