Use views-sized browser actions for MacViews

Fixes bug where the larger MD Refresh 28dp inkdrops overflow into
browser-action insets. The prior code returned 24dp icon areas as it
assumed that MacOS was always using the Cocoa implementation. This now
effectively matches ToolbarButton sizes in views.

Bug: chromium:822069
Change-Id: I27a8b2c36fe0bba57ee698aae940b1b0c472f29f
Reviewed-on: https://chromium-review.googlesource.com/1068179
Commit-Queue: Peter Boström <pbos@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561037}

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

@@ -35,6 +35,7 @@
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/extension.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
@@ -137,12 +138,11 @@ void ToolbarActionsBar::RegisterProfilePrefs(
 // static
 gfx::Size ToolbarActionsBar::GetIconAreaSize() {
 #if defined(OS_MACOSX)
-  // On the Mac, the spec is a 24x24 button in a 28x28 space.
-  constexpr gfx::Size kIconAreaSize(24, 24);
-#else
-  constexpr gfx::Size kIconAreaSize(28, 28);
+  // On Cocoa, the spec is a 24x24 button in a 28x28 space.
+  if (!base::FeatureList::IsEnabled(features::kViewsBrowserWindows))
+    return gfx::Size(24, 24);
 #endif
-  return kIconAreaSize;
+  return gfx::Size(28, 28);
 }
 
 gfx::Size ToolbarActionsBar::GetViewSize() const {