[Picture in Picture] Add margin to close button.

Per UX feedback, add some space between the close button and the edge
of the window.

BUG: 836389
Change-Id: Id527c868b6beef25e7278e737faa2e0aff4ea469
Reviewed-on: https://chromium-review.googlesource.com/1071233
Commit-Queue: apacible <apacible@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562004}

chrome/browser/ui/views/overlay/overlay_window_views.cc

@@ -35,11 +35,11 @@ constexpr gfx::Size kMinWindowSize = gfx::Size(144, 100);
 const int kBorderThickness = 5;
 const int kResizeAreaCornerSize = 16;
 
-// TODO(apacible): Update sizes per UX feedback and when scaling is determined.
-// http://crbug.com/836389
 constexpr gfx::Size kCloseButtonSize = gfx::Size(42, 42);
 constexpr gfx::Size kPlayPauseButtonSize = gfx::Size(90, 90);
 
+const int kCloseButtonMargin = 8;
+
 // Colors for the control buttons.
 SkColor kBgColor = SK_ColorWHITE;
 SkColor kControlIconColor = gfx::kChromeIconGrey;
@@ -364,9 +364,10 @@ ui::Layer* OverlayWindowViews::GetPlayPauseControlsLayer() {
 }
 
 gfx::Rect OverlayWindowViews::GetCloseControlsBounds() {
-  return gfx::Rect(
-      gfx::Point(GetBounds().size().width() - kCloseButtonSize.width(), 0),
-      kCloseButtonSize);
+  return gfx::Rect(gfx::Point(GetBounds().size().width() -
+                                  kCloseButtonSize.width() - kCloseButtonMargin,
+                              kCloseButtonMargin),
+                   kCloseButtonSize);
 }
 
 gfx::Rect OverlayWindowViews::GetPlayPauseControlsBounds() {