Convert TrayAccessibility to wm common types

ash/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/system/tray_accessibility.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
+#include "ash/common/system/tray/wm_system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_recorder.h"
-#include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
-#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.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 {
 
 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,
 };
 
 uint32_t GetAccessibilityState() {
-  AccessibilityDelegate* delegate =
-      Shell::GetInstance()->accessibility_delegate();
+  AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
   uint32_t state = A11Y_NONE;
   if (delegate->IsSpokenFeedbackEnabled())
     state |= A11Y_SPOKEN_FEEDBACK;
   if (delegate->IsHighContrastEnabled())
     state |= A11Y_HIGH_CONTRAST;
   if (delegate->IsMagnifierEnabled())
     state |= A11Y_SCREEN_MAGNIFIER;
   if (delegate->IsLargeCursorEnabled())
     state |= A11Y_LARGE_CURSOR;
   if (delegate->IsAutoclickEnabled())
@@ skipping 90 matching lines @@
   AppendHelpEntries();
   CreateSpecialRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE, this);
 
   Layout();
 }
 
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
-  AccessibilityDelegate* delegate =
-      Shell::GetInstance()->accessibility_delegate();
+  AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
   spoken_feedback_enabled_ = delegate->IsSpokenFeedbackEnabled();
   spoken_feedback_view_ =
       AddScrollListItem(bundle.GetLocalizedString(
                             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK),
                         spoken_feedback_enabled_, spoken_feedback_enabled_);
 
   // Large Cursor item is shown only in Login screen.
   if (login_ == LoginStatus::NOT_LOGGED_IN) {
     large_cursor_enabled_ = delegate->IsLargeCursorEnabled();
     large_cursor_view_ =
@@ skipping 24 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_);
 }
 
 void AccessibilityDetailedView::AppendHelpEntries() {
   // Currently the help page requires a browser window.
   // TODO(yoshiki): show this even on login/lock screen. crbug.com/158286
-  bool userAddingRunning = ash::Shell::GetInstance()
-                               ->session_state_delegate()
-                               ->IsInSecondaryLoginScreen();
-
   if (login_ == LoginStatus::NOT_LOGGED_IN || login_ == LoginStatus::LOCKED ||
-      userAddingRunning)
+      WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen())

[stevenjb, 2016/06/20 17:49:17]

We really should do a (separate) cleanup pass to combine all instances of the
above logic (including places that don't check for LOCKED but probably should)
and replace them with something like WmShell::Get()->IsInLoginOrLockScreen().

     return;
 
   views::View* bottom_row = new View();
   views::BoxLayout* layout = new
       views::BoxLayout(views::BoxLayout::kHorizontal,
                        kTrayMenuBottomRowPadding,
                        kTrayMenuBottomRowPadding,
                        kTrayMenuBottomRowPaddingBetweenItems);
   layout->SetDefaultFlex(1);
   bottom_row->SetLayoutManager(layout);
@@ skipping 21 matching lines @@
     const base::string16& text,
     bool highlight,
     bool checked) {
   HoverHighlightView* container = new HoverHighlightView(this);
   container->AddCheckableLabel(text, highlight, checked);
   scroll_content()->AddChildView(container);
   return container;
 }
 
 void AccessibilityDetailedView::OnViewClicked(views::View* sender) {
-  AccessibilityDelegate* delegate =
-      Shell::GetInstance()->accessibility_delegate();
+  AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
   if (sender == footer()->content()) {
     TransitionToDefaultView();
   } else if (sender == spoken_feedback_view_) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         delegate->IsSpokenFeedbackEnabled() ?
             ash::UMA_STATUS_AREA_DISABLE_SPOKEN_FEEDBACK :
             ash::UMA_STATUS_AREA_ENABLE_SPOKEN_FEEDBACK);
     delegate->ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_NONE);
   } else if (sender == high_contrast_view_) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         delegate->IsHighContrastEnabled() ?
             ash::UMA_STATUS_AREA_DISABLE_HIGH_CONTRAST :
             ash::UMA_STATUS_AREA_ENABLE_HIGH_CONTRAST);
     delegate->ToggleHighContrast();
   } else if (sender == screen_magnifier_view_) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         delegate->IsMagnifierEnabled() ?
             ash::UMA_STATUS_AREA_DISABLE_MAGNIFIER :
             ash::UMA_STATUS_AREA_ENABLE_MAGNIFIER);
     delegate->SetMagnifierEnabled(!delegate->IsMagnifierEnabled());
   } else if (large_cursor_view_ && sender == large_cursor_view_) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         delegate->IsLargeCursorEnabled() ?
             ash::UMA_STATUS_AREA_DISABLE_LARGE_CURSOR :
             ash::UMA_STATUS_AREA_ENABLE_LARGE_CURSOR);
     delegate->SetLargeCursorEnabled(!delegate->IsLargeCursorEnabled());
   } else if (autoclick_view_ && sender == autoclick_view_) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         delegate->IsAutoclickEnabled() ?
             ash::UMA_STATUS_AREA_DISABLE_AUTO_CLICK :
             ash::UMA_STATUS_AREA_ENABLE_AUTO_CLICK);
     delegate->SetAutoclickEnabled(!delegate->IsAutoclickEnabled());
   } else if (virtual_keyboard_view_ && sender == virtual_keyboard_view_) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         delegate->IsVirtualKeyboardEnabled() ?
             ash::UMA_STATUS_AREA_DISABLE_VIRTUAL_KEYBOARD :
             ash::UMA_STATUS_AREA_ENABLE_VIRTUAL_KEYBOARD);
     delegate->SetVirtualKeyboardEnabled(!delegate->IsVirtualKeyboardEnabled());
   }
 }
 
 void AccessibilityDetailedView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
@@ skipping 11 matching lines @@
 TrayAccessibility::TrayAccessibility(SystemTray* system_tray)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_ACCESSIBILITY),
       default_(NULL),
       detailed_popup_(NULL),
       detailed_menu_(NULL),
       request_popup_view_state_(A11Y_NONE),
       tray_icon_visible_(false),
       login_(GetCurrentLoginStatus()),
       previous_accessibility_state_(GetAccessibilityState()),
       show_a11y_menu_on_lock_screen_(true) {
-  DCHECK(Shell::GetInstance()->delegate());
   DCHECK(system_tray);
-  Shell::GetInstance()->system_tray_notifier()->AddAccessibilityObserver(this);
+  WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);
 }
 
 TrayAccessibility::~TrayAccessibility() {
-  Shell::GetInstance()->system_tray_notifier()->
-      RemoveAccessibilityObserver(this);
+  WmShell::Get()->system_tray_notifier()->RemoveAccessibilityObserver(this);
 }
 
 void TrayAccessibility::SetTrayIconVisible(bool visible) {
   if (tray_view())
     tray_view()->SetVisible(visible);
   tray_icon_visible_ = visible;
 }
 
 tray::AccessibilityDetailedView* TrayAccessibility::CreateDetailedMenu() {
   return new tray::AccessibilityDetailedView(this, login_);
 }
 
 bool TrayAccessibility::GetInitialVisibility() {
   // Shows accessibility icon if any accessibility feature is enabled.
   // Otherwise, doen't show it.
   return GetAccessibilityState() != A11Y_NONE;
 }
 
 views::View* TrayAccessibility::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
 
   // Shows accessibility menu if:
   // - on login screen (not logged in);
   // - "Enable accessibility menu" on chrome://settings is checked;
   // - or any of accessibility features is enabled
   // Otherwise, not shows it.
-  AccessibilityDelegate* delegate =
-      Shell::GetInstance()->accessibility_delegate();
+  AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
   if (login_ != LoginStatus::NOT_LOGGED_IN &&
       !delegate->ShouldShowAccessibilityMenu() &&
       // On login screen, keeps the initial visibility of the menu.
       (status != LoginStatus::LOCKED || !show_a11y_menu_on_lock_screen_))
     return NULL;
 
   CHECK(default_ == NULL);
   default_ = new tray::DefaultAccessibilityView(this);
 
   return default_;
 }
 
 views::View* TrayAccessibility::CreateDetailedView(LoginStatus status) {
   CHECK(detailed_popup_ == NULL);
   CHECK(detailed_menu_ == NULL);
 
   if (request_popup_view_state_) {
     detailed_popup_ =
         new tray::AccessibilityPopupView(this, request_popup_view_state_);
     request_popup_view_state_ = A11Y_NONE;
     return detailed_popup_;
   } else {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         ash::UMA_STATUS_AREA_DETAILED_ACCESSABILITY);
     detailed_menu_ = CreateDetailedMenu();
     return detailed_menu_;
   }
 }
 
 void TrayAccessibility::DestroyDefaultView() {
   default_ = NULL;
 }
 
@@ skipping 36 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash