Update chromeos system menu buttons for MD.

ash/common/system/tray_accessibility.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 "ash/common/system/tray_accessibility.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 21 matching lines @@
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
+bool UseMdMenu() {
+  return MaterialDesignController::IsSystemTrayMenuMaterial();
+}
+
 enum AccessibilityState {
   A11Y_NONE = 0,
   A11Y_SPOKEN_FEEDBACK = 1 << 0,
   A11Y_HIGH_CONTRAST = 1 << 1,
   A11Y_SCREEN_MAGNIFIER = 1 << 2,
   A11Y_LARGE_CURSOR = 1 << 3,
   A11Y_AUTOCLICK = 1 << 4,
   A11Y_VIRTUAL_KEYBOARD = 1 << 5,
   A11Y_BRAILLE_DISPLAY_CONNECTED = 1 << 6,
 };
@@ skipping 43 matching lines @@
     set_id(test::kAccessibilityTrayItemViewId);
   }
 
   ~DefaultAccessibilityView() override {}
 
  protected:
   // TrayItemMore:
   void UpdateStyle() override {
     TrayItemMore::UpdateStyle();
 
-    if (!MaterialDesignController::IsSystemTrayMenuMaterial())
+    if (!UseMdMenu())
       return;
 
     std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
     SetImage(gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon,
                                    style->GetForegroundColor()));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView);
 };
@@ skipping 46 matching lines @@
       high_contrast_enabled_(false),
       screen_magnifier_enabled_(false),
       large_cursor_enabled_(false),
       autoclick_enabled_(false),
       virtual_keyboard_enabled_(false),
       login_(login) {
   Reset();
 
   AppendAccessibilityList();
 
-  if (!MaterialDesignController::IsSystemTrayMenuMaterial())
+  if (!UseMdMenu())
     AppendHelpEntries();
 
   CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE);
 
   Layout();
 }
 
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
@@ skipping 40 matching lines @@
 
   virtual_keyboard_enabled_ = delegate->IsVirtualKeyboardEnabled();
   virtual_keyboard_view_ =
       AddScrollListItem(bundle.GetLocalizedString(
                             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD),
                         virtual_keyboard_enabled_, virtual_keyboard_enabled_,
                         kSystemMenuKeyboardIcon);
 }
 
 void AccessibilityDetailedView::AppendHelpEntries() {
+  DCHECK(!UseMdMenu());
   // Currently the help page requires a browser window.
   // TODO(yoshiki): show this even on login/lock screen. crbug.com/158286
   if (!CanOpenWebUISettings(login_))
     return;
 
   views::View* bottom_row = new View();
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, kTrayMenuBottomRowPadding,
       kTrayMenuBottomRowPadding, kTrayMenuBottomRowPaddingBetweenItems);
   layout->SetDefaultFlex(1);
@@ skipping 15 matching lines @@
 
   AddChildView(bottom_row);
 }
 
 HoverHighlightView* AccessibilityDetailedView::AddScrollListItem(
     const base::string16& text,
     bool highlight,
     bool checked,
     const gfx::VectorIcon& icon) {
   HoverHighlightView* container = new HoverHighlightView(this);
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (UseMdMenu()) {
     gfx::ImageSkia image = CreateVectorIcon(icon, kMenuIconColor);
     const int padding = (kMenuButtonSize - image.width()) / 2;
     container->AddIconAndLabelCustomSize(
         image, text, highlight,
         image.width() + kMenuSeparatorVerticalPadding * 2, padding, padding);
     gfx::ImageSkia check_mark =
         CreateVectorIcon(gfx::VectorIconId::CHECK_CIRCLE, gfx::kGoogleGreen700);
     container->AddRightIcon(check_mark, check_mark.width());
     container->SetRightIconVisible(checked);
   } else {
@@ skipping 44 matching lines @@
 
 void AccessibilityDetailedView::HandleButtonPressed(views::Button* sender,
                                                     const ui::Event& event) {
   if (sender == help_view_)
     ShowHelp();
   else if (sender == settings_view_)
     ShowSettings();
 }
 
 void AccessibilityDetailedView::CreateExtraTitleRowButtons() {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (UseMdMenu()) {
     help_view_ = title_row()->AddHelpButton(this, login_);
     settings_view_ = title_row()->AddSettingsButton(this, login_);
   }
 }
 
 void AccessibilityDetailedView::ShowSettings() {
   if (CanOpenWebUISettings(login_)) {
     WmShell::Get()->system_tray_controller()->ShowAccessibilitySettings();
     owner()->system_tray()->CloseSystemBubble();
   }
@@ skipping 128 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash