harmony: convert device chooser

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"
@@ skipping 53 matching lines @@
 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 non-Harmony dialogs.
 const int kTabbedPaneTopPadding = 14;
 const int kCookieInfoBottomPadding = 4;
 
-LayoutDelegate::Metric GetTreeviewToButtonsMetric() {
-  // 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::Metric::UNRELATED_CONTROL_VERTICAL_SPACING
-             : LayoutDelegate::Metric::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(
         views::CreateSolidBorder(kInfobarBorderSize, border_color));
@@ skipping 310 matching lines @@
   layout->AddPaddingRow(
       0,
       LayoutDelegate::Get()->GetMetric(
           LayoutDelegate::Metric::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, LayoutDelegate::Get()->GetMetric(GetTreeviewToButtonsMetric()));
+      0, LayoutDelegate::Get()->GetMetric(
+             LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING));
 
   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 55 matching lines @@
   layout->AddPaddingRow(
       0,
       LayoutDelegate::Get()->GetMetric(
           LayoutDelegate::Metric::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, LayoutDelegate::Get()->GetMetric(GetTreeviewToButtonsMetric()));
+      0, LayoutDelegate::Get()->GetMetric(
+             LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING));
 
   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();
 }