[ash-md] Allows ToggleButton to have a border and adds focus rectangle

ash/common/system/tray/tray_popup_utils.cc

 // Copyright 2016 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 "ash/common/system/tray/tray_popup_utils.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/size_range_layout.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/tray_popup_label_button_border.h"
 #include "ash/common/wm_shell.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 #include "ui/views/animation/square_ink_drop_ripple.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
+#include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/slider.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
+#include "ui/views/painter.h"
 
 namespace ash {
 
 namespace {
 
 // Creates a layout manager that positions Views vertically. The Views will be
 // stretched horizontally and centered vertically.
 std::unique_ptr<views::LayoutManager> CreateDefaultCenterLayoutManager() {
   // TODO(bruthig): Use constants instead of magic numbers.
   auto box_layout =
@@ skipping 195 matching lines @@
   if (is_material) {
     slider->SetBorder(
         views::CreateEmptyBorder(gfx::Insets(0, kTrayPopupSliderPaddingMD)));
   } else {
     slider->SetBorder(
         views::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems));
   }
   return slider;
 }
 
+views::ToggleButton* TrayPopupUtils::CreateToggleButton(
+    views::ButtonListener* listener,
+    int accessible_name_id) {
+  views::ToggleButton* toggle = new views::ToggleButton(listener);
+  toggle->SetBorder(views::CreateEmptyBorder(gfx::Insets(
+      kTrayToggleButtonVerticalPadding, kTrayToggleButtonHorizontalPadding)));
+  toggle->set_focus_painter(views::Painter::CreateSolidFocusPainter(
+      kFocusBorderColor, gfx::Insets(1)));

[Evan Stade, 2016/11/17 22:32:22]

insets should be gfx::Insets(0,0,1,1) (CreateSolidFocusPainter is broken like
that)

[varkha, 2016/11/17 22:51:54]

This is probably the right thing to do but it needs to be done in sync with
ImageButton as used in the system menu [1]. I can post a CL with that but they
need to stay in sync.

[1] -
https://cs.chromium.org/chromium/src/ash/common/system/tray/system_menu_butto...

+  toggle->SetFocusForPlatform();

[Evan Stade, 2016/11/17 22:32:22]

seems like this should be part of the base ToggleButton impl

[varkha, 2016/11/17 22:51:54]

Done.

+  toggle->SetTooltipText(l10n_util::GetStringUTF16(accessible_name_id));

[Evan Stade, 2016/11/17 22:32:22]

This is a behavioral change. Terry and I decided against tooltips for toggle
buttons as they're redundant. You do want SetAccessibleName though.

[varkha, 2016/11/17 22:51:54]

Done.

+  return toggle;
+}
+
 void TrayPopupUtils::ConfigureAsStickyHeader(views::View* view) {
   view->set_id(VIEW_ID_STICKY_HEADER);
   view->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
   view->SetBorder(
       views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0)));
 }
 
 void TrayPopupUtils::ConfigureContainer(TriView::Container container,
                                         views::View* container_view) {
@@ skipping 118 matching lines @@
 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace ash