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

chrome/browser/ui/views/infobars/infobar_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/infobars/infobar_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 216 matching lines @@
 
   // Even though other views are technically grandchildren, we'll lay them out
   // here on behalf of |child_container_|.
   int start_x = kEdgeItemPadding;
   if (icon_ != NULL) {
     icon_->SetPosition(gfx::Point(start_x, OffsetY(icon_)));
     start_x = icon_->bounds().right() + kIconToLabelSpacing;
   }
 
   int content_minimum_width = ContentMinimumWidth();
+  close_button_->SizeToPreferredSize();
   close_button_->SetPosition(gfx::Point(
       std::max(
           start_x + content_minimum_width +
               ((content_minimum_width > 0) ? kBeforeCloseButtonSpacing : 0),
           width() - kEdgeItemPadding - close_button_->width()),
       OffsetY(close_button_)));
 
   // For accessibility reasons, the close button should come last.
   DCHECK_EQ(close_button_->parent()->child_count() - 1,
             close_button_->parent()->GetIndexOf(close_button_));
@@ skipping 21 matching lines @@
     } else {
       close_button_ = new views::ImageButton(this);
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       close_button_->SetImage(views::CustomButton::STATE_NORMAL,
                               rb.GetImageNamed(IDR_CLOSE_1).ToImageSkia());
       close_button_->SetImage(views::CustomButton::STATE_HOVERED,
                               rb.GetImageNamed(IDR_CLOSE_1_H).ToImageSkia());
       close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                               rb.GetImageNamed(IDR_CLOSE_1_P).ToImageSkia());
     }
-    close_button_->SizeToPreferredSize();
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     close_button_->SetFocusable(true);
     // Subclasses should already be done adding child views by this point (see
     // related DCHECK in Layout()).
     child_container_->AddChildView(close_button_);
   }
 
   // Ensure the infobar is tall enough to display its contents.
   int height = ui::MaterialDesignController::IsModeMaterial()
@@ skipping 142 matching lines @@
 }
 
 bool InfoBarView::DoesIntersectRect(const View* target,
                                     const gfx::Rect& rect) const {
   DCHECK_EQ(this, target);
   // Only events that intersect the portion below the arrow are interesting.
   gfx::Rect non_arrow_bounds = GetLocalBounds();
   non_arrow_bounds.Inset(0, arrow_height(), 0, 0);
   return rect.Intersects(non_arrow_bounds);
 }