Convert Register Protocol Handler dialog for Harmony/Material Design

chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/layout_constants.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
@@ skipping 162 matching lines @@
     preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
   }
   return preferred_size;
 }
 
 void ContentSettingBubbleContents::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
+  const LayoutDelegate* layout_delegate = LayoutDelegate::Get();
 
   const int kSingleColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kSingleColumnSetId);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, layout_delegate->GetLayoutDistance(
+                                      LayoutDelegate::LayoutDistanceType::
+                                          RELATED_CONTROL_HORIZONTAL_SPACING));

[Peter Kasting, 2016/12/12 22:24:16]

Seems unfortunate that we have to write something this verbose so many times.

None of my solution ideas are great (e.g. "add namespace alias locally to reduce
length of qualified enum name; bind a lamba to
layout_delegate->GetLayoutDistance(); store return values for various distances
in locals").  Feel free to use any of these, or none, or others, if you have
ideas on how to improve.

[kylix_rd, 2016/12/13 14:21:23]

Good point. I was slavishly following the examples set forth in some of the
other already converted code. I should know better.

   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model_->bubble_content();
   bool bubble_content_empty = true;
 
   if (!bubble_content.title.empty()) {
     views::Label* title_label = new views::Label(bubble_content.title);
     title_label->SetMultiLine(true);
     title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->StartRow(0, kSingleColumnSetId);
     layout->AddView(title_label);
     bubble_content_empty = false;
   }
 
   if (!bubble_content.message.empty()) {
     views::Label* message_label = new views::Label(bubble_content.message);
-    layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
+                                 LayoutDelegate::LayoutDistanceType::
+                                     UNRELATED_CONTROL_VERTICAL_SPACING));
     message_label->SetMultiLine(true);
     message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->StartRow(0, kSingleColumnSetId);
     layout->AddView(message_label);
     bubble_content_empty = false;
   }
 
   if (!bubble_content.learn_more_link.empty()) {
     learn_more_link_ =
         new views::Link(base::UTF8ToUTF16(bubble_content.learn_more_link));
     learn_more_link_->set_listener(this);
     learn_more_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(learn_more_link_);
     bubble_content_empty = false;
   }
 
   // Layout for the item list (blocked plugins and popups).
   if (!bubble_content.list_items.empty()) {
     const int kItemListColumnSetId = 2;
     views::ColumnSet* item_list_column_set =
         layout->AddColumnSet(kItemListColumnSetId);
     item_list_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                                     GridLayout::USE_PREF, 0, 0);
     item_list_column_set->AddPaddingColumn(
-        0, views::kRelatedControlHorizontalSpacing);
+        0, layout_delegate->GetLayoutDistance(
+               LayoutDelegate::LayoutDistanceType::
+                   RELATED_CONTROL_HORIZONTAL_SPACING));
     item_list_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                     GridLayout::USE_PREF, 0, 0);
 
     int row = 0;
     for (const ContentSettingBubbleModel::ListItem& list_item :
          bubble_content.list_items) {
       if (!bubble_content_empty)
-        layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+        layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
+                                     LayoutDelegate::LayoutDistanceType::
+                                         RELATED_CONTROL_VERTICAL_SPACING));
       layout->StartRow(0, kItemListColumnSetId);
       if (list_item.has_link) {
         views::Link* link = new views::Link(base::UTF8ToUTF16(list_item.title));
         link->set_listener(this);
         link->SetElideBehavior(gfx::ELIDE_MIDDLE);
         list_item_links_[link] = row;
         layout->AddView(new Favicon(list_item.image, this, link));
         layout->AddView(link);
       } else {
         views::ImageView* icon = new views::ImageView();
@@ skipping 11 matching lines @@
   views::ColumnSet* indented_single_column_set =
       layout->AddColumnSet(indented_kSingleColumnSetId);
   indented_single_column_set->AddPaddingColumn(0, views::kCheckboxIndent);
   indented_single_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
                                         1, GridLayout::USE_PREF, 0, 0);
 
   const ContentSettingBubbleModel::RadioGroup& radio_group =
       bubble_content.radio_group;
   if (!radio_group.radio_items.empty()) {
     if (!bubble_content_empty)
-      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+      layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
+                                   LayoutDelegate::LayoutDistanceType::
+                                       RELATED_CONTROL_VERTICAL_SPACING));
     for (ContentSettingBubbleModel::RadioItems::const_iterator i(
          radio_group.radio_items.begin());
          i != radio_group.radio_items.end(); ++i) {
       views::RadioButton* radio =
           new views::RadioButton(base::UTF8ToUTF16(*i), 0);
       radio->SetEnabled(bubble_content.radio_group_enabled);
       radio->set_listener(this);
       radio_group_.push_back(radio);
       layout->StartRow(0, indented_kSingleColumnSetId);
       layout->AddView(radio);
       bubble_content_empty = false;
     }
     DCHECK(!radio_group_.empty());
     // Now that the buttons have been added to the view hierarchy, it's safe
     // to call SetChecked() on them.
     radio_group_[radio_group.default_item]->SetChecked(true);
   }
 
   // Layout code for the media device menus.
   if (content_setting_bubble_model_->AsMediaStreamBubbleModel()) {
     const int kMediaMenuColumnSetId = 4;
     views::ColumnSet* menu_column_set =
         layout->AddColumnSet(kMediaMenuColumnSetId);
     menu_column_set->AddPaddingColumn(0, views::kCheckboxIndent);
     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                                GridLayout::USE_PREF, 0, 0);
     menu_column_set->AddPaddingColumn(
         0, views::kRelatedControlHorizontalSpacing);

[Peter Kasting, 2016/12/12 22:24:16]

Do you need to fix this one?

[kylix_rd, 2016/12/13 14:21:23]

Doh! And that's why we have code reviews...

     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                GridLayout::USE_PREF, 0, 0);
 
     for (ContentSettingBubbleModel::MediaMenuMap::const_iterator i(
          bubble_content.media_menus.begin());
          i != bubble_content.media_menus.end(); ++i) {
       if (!bubble_content_empty)
-        layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+        layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
+                                     LayoutDelegate::LayoutDistanceType::
+                                         RELATED_CONTROL_VERTICAL_SPACING));
       layout->StartRow(0, kMediaMenuColumnSetId);
 
       views::Label* label =
           new views::Label(base::UTF8ToUTF16(i->second.label));
       label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       layout->AddView(label);
 
       combobox_models_.emplace_back(i->first);
       MediaComboboxModel* model = &combobox_models_.back();
       views::Combobox* combobox = new views::Combobox(model);
@@ skipping 30 matching lines @@
     }
     bubble_content_empty = false;
   }
 
   if (!bubble_content.custom_link.empty()) {
     custom_link_ =
         new views::Link(base::UTF8ToUTF16(bubble_content.custom_link));
     custom_link_->SetEnabled(bubble_content.custom_link_enabled);
     custom_link_->set_listener(this);
     if (!bubble_content_empty)
-      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+      layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
+                                   LayoutDelegate::LayoutDistanceType::
+                                       RELATED_CONTROL_VERTICAL_SPACING));
     layout->StartRow(0, kSingleColumnSetId);
     layout->AddView(custom_link_);
     bubble_content_empty = false;
   }
 
   if (!bubble_content_empty) {
-    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
+                                 LayoutDelegate::LayoutDistanceType::
+                                     RELATED_CONTROL_VERTICAL_SPACING));
     layout->StartRow(0, kSingleColumnSetId);
     layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 1, 1,
                     GridLayout::FILL, GridLayout::FILL);
-    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
+                                 LayoutDelegate::LayoutDistanceType::
+                                     RELATED_CONTROL_VERTICAL_SPACING));
   }
 }
 
 views::View* ContentSettingBubbleContents::CreateExtraView() {
   if (content_setting_bubble_model_->bubble_content()
           .show_manage_text_as_button) {
     manage_button_ = views::MdTextButton::CreateSecondaryUiButton(
         this, base::UTF8ToUTF16(
                   content_setting_bubble_model_->bubble_content().manage_text));
     return manage_button_;
@@ skipping 68 matching lines @@
   DCHECK(i != list_item_links_.end());
   content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(
       model->type(), model->GetDevices()[combobox->selected_index()].id);
 }