harmony: convert 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/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/views/cookie_info_view.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/layout_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 24 matching lines @@
 // Width of the infobar frame.
 const int kInfobarBorderSize = 1;
 
 // Dimensions of the tree views.
 const int kTreeViewWidth = 400;
 const int kTreeViewHeight = 125;
 
 // The color of the border around the cookies tree view.
 const SkColor kCookiesBorderColor = SkColorSetRGB(0xC8, 0xC8, 0xC8);
 
-// Spacing constants used with the new dialog style.
+// Spacing constants used with non-Harmony dialogs.
 const int kTabbedPaneTopPadding = 14;
-const int kLabelBottomPadding = 17;
 const int kCookieInfoBottomPadding = 4;
-const int kVPanelPadding = 15;
+
+LayoutDelegate::LayoutDistanceType GetTreeviewToButtonsDistanceType() {
+  // Hack: in the Harmony specs, the buttons under the treeview are "unrelated"
+  // to it (which looks better), but in the existing dialog they were related.
+  return LayoutDelegate::Get()->IsHarmonyMode()
+             ? LayoutDelegate::LayoutDistanceType::
+                   UNRELATED_CONTROL_VERTICAL_SPACING
+             : LayoutDelegate::LayoutDistanceType::
+                   RELATED_CONTROL_VERTICAL_SPACING;
+}
 
 }  // namespace
 
 // A custom view that conditionally displays an infobar.
 class InfobarView : public views::View {
  public:
   InfobarView() {
     content_ = new views::View;
     SkColor border_color = SK_ColorGRAY;
     content_->SetBorder(
@@ skipping 180 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, views::View overrides:
 
 gfx::Size CollectedCookiesViews::GetMinimumSize() const {
   // Allow UpdateWebContentsModalDialogPosition to clamp the dialog width.
   return gfx::Size(0, View::GetMinimumSize().height());
 }
 
+gfx::Size CollectedCookiesViews::GetPreferredSize() const {
+  int preferred = LayoutDelegate::Get()->GetDialogPreferredWidth(
+      LayoutDelegate::DialogWidthType::MEDIUM);
+  return gfx::Size(preferred ? preferred : View::GetPreferredSize().width(),
+                   View::GetPreferredSize().height());
+}
+
 void CollectedCookiesViews::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   views::DialogDelegateView::ViewHierarchyChanged(details);
   if (details.is_add && details.child == this)
     Init();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, private:
 
 CollectedCookiesViews::~CollectedCookiesViews() {
   allowed_cookies_tree_->SetModel(NULL);
   blocked_cookies_tree_->SetModel(NULL);
 }
 
 void CollectedCookiesViews::Init() {
   using views::GridLayout;
 
-  GridLayout* layout = GridLayout::CreatePanel(this);
+  GridLayout* layout = new GridLayout(this);
+  if (LayoutDelegate::Get()->UseExtraDialogPadding())
+    layout->SetInsets(gfx::Insets(kTabbedPaneTopPadding, 0, 0, 0));
   SetLayoutManager(layout);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   views::TabbedPane* tabbed_pane = new views::TabbedPane();
-  layout->SetInsets(gfx::Insets(kTabbedPaneTopPadding, 0, 0, 0));
 
   layout->AddView(tabbed_pane);
   // NOTE: Panes must be added after |tabbed_pane| has been added to its parent.
   base::string16 label_allowed = l10n_util::GetStringUTF16(
       IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL);
   base::string16 label_blocked = l10n_util::GetStringUTF16(
       IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_TAB_LABEL);
   tabbed_pane->AddTab(label_allowed, CreateAllowedPane());
   tabbed_pane->AddTab(label_blocked, CreateBlockedPane());
   tabbed_pane->SelectTabAt(0);
   tabbed_pane->set_listener(this);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  if (LayoutDelegate::Get()->UseExtraDialogPadding()) {
+    layout->AddPaddingRow(0, LayoutDelegate::Get()->GetLayoutDistance(
+                                 LayoutDelegate::LayoutDistanceType::
+                                     RELATED_CONTROL_VERTICAL_SPACING));
+  }
 
   layout->StartRow(0, single_column_layout_id);
   cookie_info_view_ = new CookieInfoView();
   layout->AddView(cookie_info_view_);
-  layout->AddPaddingRow(0, kCookieInfoBottomPadding);
+  if (LayoutDelegate::Get()->UseExtraDialogPadding())
+    layout->AddPaddingRow(0, kCookieInfoBottomPadding);
 
   layout->StartRow(0, single_column_layout_id);
   infobar_ = new InfobarView();
   layout->AddView(infobar_);
 
   EnableControls();
   ShowCookieInfo();
 }
 
 views::View* CollectedCookiesViews::CreateAllowedPane() {
@@ skipping 18 matching lines @@
       l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_BLOCK_BUTTON));
 
   delete_allowed_button_ = views::MdTextButton::CreateSecondaryUiButton(this,
       l10n_util::GetStringUTF16(IDS_COOKIES_REMOVE_LABEL));
 
   // 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);
+  GridLayout* layout = layout_utils::CreatePanelLayout(pane);
 
   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->AddPaddingColumn(0, LayoutDelegate::Get()->GetLayoutDistance(
+                                      LayoutDelegate::LayoutDistanceType::
+                                          RELATED_CONTROL_HORIZONTAL_SPACING));
   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->AddPaddingRow(0, LayoutDelegate::Get()->GetLayoutDistance(
+                               LayoutDelegate::LayoutDistanceType::
+                                   UNRELATED_CONTROL_VERTICAL_SPACING));
 
   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->AddPaddingRow(0, LayoutDelegate::Get()->GetLayoutDistance(
+                               GetTreeviewToButtonsDistanceType()));
 
   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 =
@@ skipping 25 matching lines @@
       this, l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_ALLOW_BUTTON));
   for_session_blocked_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this,
       l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON));
 
   // 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);
+  GridLayout* layout = layout_utils::CreatePanelLayout(pane);
 
   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->AddPaddingColumn(0, LayoutDelegate::Get()->GetLayoutDistance(
+                                      LayoutDelegate::LayoutDistanceType::
+                                          RELATED_CONTROL_HORIZONTAL_SPACING));
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(blocked_label_, 1, 1, GridLayout::FILL, GridLayout::FILL);
-  layout->AddPaddingRow(0, kLabelBottomPadding);
+  layout->AddPaddingRow(0, LayoutDelegate::Get()->GetLayoutDistance(
+                               LayoutDelegate::LayoutDistanceType::
+                                   UNRELATED_CONTROL_VERTICAL_SPACING));
 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(
       CreateScrollView(blocked_cookies_tree_), 1, 1,
       GridLayout::FILL, GridLayout::FILL, kTreeViewWidth, kTreeViewHeight);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, LayoutDelegate::Get()->GetLayoutDistance(
+                               GetTreeviewToButtonsDistanceType()));
 
   layout->StartRow(0, three_columns_layout_id);
   layout->AddView(allow_blocked_button_);
   layout->AddView(for_session_blocked_button_);
 
   return pane;
 }
 
 views::View* CollectedCookiesViews::CreateScrollView(views::TreeView* pane) {
   views::ScrollView* scroll_view = new views::ScrollView();
@@ skipping 68 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);
   GetWidget()->Close();
 }