CrOS MD Menu - Some more user row tweaks.

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"
@@ skipping 95 matching lines @@
 class BorderlessLabelButton : public views::LabelButton {
  public:
   BorderlessLabelButton(views::ButtonListener* listener,
                         const base::string16& text)
       : LabelButton(listener, text) {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       SetInkDropMode(views::InkDropHostView::InkDropMode::ON);
       set_has_ink_drop_action_on_click(true);
       set_ink_drop_base_color(kTrayPopupInkDropBaseColor);
       set_ink_drop_visible_opacity(kTrayPopupInkDropRippleOpacity);
-      const int kHorizontalPadding = 8;
+      const int kHorizontalPadding = 20;
       SetBorder(views::CreateEmptyBorder(gfx::Insets(0, kHorizontalPadding)));
-      TrayPopupItemStyle style(nullptr, TrayPopupItemStyle::FontStyle::BUTTON);
+      TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::BUTTON);
       style.SetupLabel(label());
       // TODO(tdanderson): Update focus rect for material design. See
       // crbug.com/615892
       // Hack alert: CreateSolidFocusPainter should add 0.5f to all insets to
       // make the lines align to pixel centers, but for now it doesn't. We can
       // get around this by relying on Skia rounding up integer coordinates.
       SetFocusPainter(views::Painter::CreateSolidFocusPainter(
           kFocusBorderColor, gfx::Insets(0, 0, 1, 1)));
     } else {
       SetBorder(std::unique_ptr<views::Border>(new TrayPopupLabelButtonBorder));
       SetFocusPainter(views::Painter::CreateSolidFocusPainter(
           kFocusBorderColor, gfx::Insets(1, 1, 2, 2)));
       set_animate_on_state_change(false);
     }
     SetHorizontalAlignment(gfx::ALIGN_CENTER);
     SetFocusForPlatform();
   }
 
   ~BorderlessLabelButton() override {}
 
   // views::LabelButton:
   int GetHeightForWidth(int width) const override {
     if (MaterialDesignController::IsSystemTrayMenuMaterial())
-      return kMenuButtonSize - 2 * kTrayPopupInkDropInset;
+      return kMenuButtonSize;
 
     return LabelButton::GetHeightForWidth(width);
   }
 
  private:
   std::unique_ptr<views::InkDrop> CreateInkDrop() override {
     return TrayPopupUtils::CreateInkDrop(TrayPopupInkDropStyle::INSET_BOUNDS,
                                          this);
   }
 
@@ skipping 277 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