harmony: fix collected cookies dialog spacing and button insets

ui/views/window/dialog_client_view.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 "ui/views/window/dialog_client_view.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 202 matching lines @@
         // The call to LayoutButton() will already have accounted for some of
         // the padding.
         custom_padding -= kRelatedButtonHSpacing;
         row_bounds.set_width(row_bounds.width() - custom_padding);
       }
       row_bounds.set_width(std::min(row_bounds.width(),
           extra_view_->GetPreferredSize().width()));
       extra_view_->SetBoundsRect(row_bounds);
     }
 
-    if (height > 0)
-      bounds.Inset(0, 0, 0, height + kRelatedControlVerticalSpacing);
+    if (height > 0) {
+      // If the ViewsDelegate supplies a non-zero top inset, use that;

[sky, 2016/11/23 20:28:37]

Might the ViewsDelegate supply 0?

[Elly Fong-Jones, 2016/11/28 17:02:49]

Yes - in non-Harmony mode, ChromeViewsDelegate::GetDialogButtonInsets() returns
a zero top inset, since that was the default before. I don't know why it was the
default, but I fear to change it :)

[sky, 2016/11/28 17:44:35]

If it returns 0 then you fallback to using the kRelatedControlVerticalSpacing.
Is that expected?

[sky, 2016/11/28 19:05:05]

I don't think I'm being clear. Let me try again.
If you implement the way you have it now even if the delegate returns 0, it's is
forced to kRelatedControlVerticalSpacing. Are you sure you don't want:

int spacing = ViewsDelegate::GetInstance() ?
ViewsDelegate::GetInstance()->Get.... : kRelatedControlVerticalSpacing;

That way the delegate can return 0 and really get 0.

+      // otherwise, use kRelatedControlVerticalSpacing.
+      int spacing =
+          ViewsDelegate::GetInstance()
+              ? ViewsDelegate::GetInstance()->GetDialogButtonInsets().top()
+              : 0;
+      if (!spacing)
+        spacing = kRelatedControlVerticalSpacing;
+      bounds.Inset(0, 0, 0, height + spacing);
+    }
   }
 
   // Layout the contents view to the top and side edges of the contents bounds.
   // NOTE: The local insets do not apply to the contents view sides or top.
   const gfx::Rect contents_bounds = GetContentsBounds();
   contents_view()->SetBounds(contents_bounds.x(), contents_bounds.y(),
       contents_bounds.width(), bounds.bottom() - contents_bounds.y());
 }
 
 bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) {
@@ skipping 139 matching lines @@
       std::remove(child_views.begin(), child_views.end(), nullptr),
       child_views.end());
 
   // Setup focus by reordering views. It is not safe to use SetNextFocusableView
   // since child views may be added externally to this view.
   for (size_t i = 0; i < child_views.size(); i++)
     ReorderChildView(child_views[i], i);
 }
 
 }  // namespace views