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

chrome/browser/ui/views/find_bar_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/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 314 matching lines @@
   if (ui::MaterialDesignController::IsModeMaterial()) {
     views::View::Layout();
   } else {
     int panel_width = GetPreferredSize().width();
 
     // Stay within view bounds.
     int view_width = width();
     if (view_width && view_width < panel_width)
       panel_width = view_width;
 
-    // First we draw the close button on the far right.
-    gfx::Size sz = close_button_->GetPreferredSize();
-    close_button_->SetBounds(panel_width - sz.width() -
-                                 kMarginRightOfCloseButton,
-                             (height() - sz.height()) / 2,
-                             sz.width(),
-                             sz.height());
     // Set the color.
     OnThemeChanged();
 
-    // Next, the FindNext button to the left the close button.
-    sz = find_next_button_->GetPreferredSize();
-    find_next_button_->SetBounds(close_button_->x() -
-                                     find_next_button_->width() -
-                                     kMarginLeftOfCloseButton,
-                                 (height() - sz.height()) / 2,
-                                  sz.width(),
-                                  sz.height());
+    // First we position the close button on the far right.
+    close_button_->SizeToPreferredSize();
+    close_button_->SetPosition(gfx::Point(
+        panel_width - close_button_->width() - kMarginRightOfCloseButton,
+        (height() - close_button_->height()) / 2));
 
-    // Then, the FindPrevious button to the left the FindNext button.
-    sz = find_previous_button_->GetPreferredSize();
-    find_previous_button_->SetBounds(find_next_button_->x() -
-                                         find_previous_button_->width(),
-                                     (height() - sz.height()) / 2,
-                                     sz.width(),
-                                     sz.height());
+    // Then, the next button to the left of the close button.
+    find_next_button_->SizeToPreferredSize();
+    find_next_button_->SetPosition(
+        gfx::Point(close_button_->x() - find_next_button_->width() -
+                       kMarginLeftOfCloseButton,
+                   (height() - find_next_button_->height()) / 2));
+
+    // Then, the previous button to the left of the next button.
+    find_previous_button_->SizeToPreferredSize();
+    find_previous_button_->SetPosition(gfx::Point(
+        find_next_button_->x() - find_previous_button_->width(),
+        (height() - find_previous_button_->height()) / 2));
 
     // Then the label showing the match count number.
-    sz = match_count_text_->GetPreferredSize();
+    gfx::Size sz = match_count_text_->GetPreferredSize();
     // We extend the label bounds a bit to give the background highlighting a
     // bit of breathing room (margins around the text).
     sz.Enlarge(kMatchCountExtraWidth, 0);
     sz.SetToMax(gfx::Size(kMatchCountMinWidth, 0));
     const int match_count_x =
         find_previous_button_->x() - kMarginRightOfMatchCountLabel - sz.width();
     const int find_text_y = kMarginVerticalFindTextfield;
     const gfx::Insets find_text_insets(find_text_->GetInsets());
     match_count_text_->SetBounds(match_count_x,
                                  find_text_y - find_text_insets.top() +
@@ skipping 287 matching lines @@
   SkColor text_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_TextfieldDefaultColor);
   match_count_text_->SetEnabledColor(SkColorSetA(text_color, 0x69));
   separator_->SetColor(SkColorSetA(text_color, 0x26));
 }
 
 SkColor FindBarView::GetTextColorForIcon() {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }