[MD] Use same focus ring on BarControlButton as MdTextButton.

chrome/browser/ui/views/download/download_shelf_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 "chrome/browser/ui/views/download/download_shelf_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 300 matching lines @@
   // Align vertically with show_all_view_.
   arrow_image_->SetBounds(next_x,
                           CenterPosition(image_size.height(), height()),
                           image_size.width(), image_size.height());
   next_x += image_size.width() + kDownloadsTitlePadding;
   show_all_view_->SetBounds(next_x,
                             CenterPosition(show_all_size.height(), height()),
                             show_all_size.width(),
                             show_all_size.height());
   next_x += show_all_size.width() + GetCloseAndLinkPadding();
-  // If the window is maximized, we want to expand the hitbox of the close
-  // button to the right and bottom to make it easier to click.
-  bool is_maximized = browser_->window()->IsMaximized();
-  int y = CenterPosition(close_button_size.height(), height());
-  close_button_->SetBounds(next_x, y,
-      is_maximized ? width() - next_x : close_button_size.width(),
-      is_maximized ? height() - y : close_button_size.height());
+  close_button_->SizeToPreferredSize();
+  close_button_->SetPosition(
+      gfx::Point(next_x, CenterPosition(close_button_->height(), height())));
   if (show_link_only) {
     // Let's hide all the items.
     for (auto ri = download_views_.rbegin(); ri != download_views_.rend(); ++ri)
       (*ri)->SetVisible(false);
     return;
   }
 
   next_x = GetStartPadding();
   for (auto ri = download_views_.rbegin(); ri != download_views_.rend(); ++ri) {
     gfx::Size view_size = (*ri)->GetPreferredSize();
@@ skipping 151 matching lines @@
 
 content::DownloadItem* DownloadShelfView::GetDownloadItemForView(size_t i) {
   if (ui::MaterialDesignController::IsModeMaterial())
     return static_cast<DownloadItemViewMd*>(download_views_[i])->download();
   return static_cast<DownloadItemView*>(download_views_[i])->download();
 }
 
 SkColor DownloadShelfView::GetTextColorForIconMd() {
   return DownloadItemViewMd::GetTextColorForThemeProvider(GetThemeProvider());
 }