Revert of Make TrayDetailsView a ViewClickListener and ButtonListener

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 134 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();
   AppendHelpEntries();
-  CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE);
+  CreateSpecialRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE, this);
 
   Layout();
 }
 
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
   AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
   spoken_feedback_enabled_ = delegate->IsSpokenFeedbackEnabled();
@@ skipping 71 matching lines @@
 HoverHighlightView* AccessibilityDetailedView::AddScrollListItem(
     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::HandleViewClicked(views::View* view) {
+void AccessibilityDetailedView::OnViewClicked(views::View* sender) {
   AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
-  if (view == spoken_feedback_view_) {
+  if (sender == footer()->content()) {
+    TransitionToDefaultView();
+  } else if (sender == spoken_feedback_view_) {
     WmShell::Get()->RecordUserMetricsAction(
         delegate->IsSpokenFeedbackEnabled()
             ? ash::UMA_STATUS_AREA_DISABLE_SPOKEN_FEEDBACK
             : ash::UMA_STATUS_AREA_ENABLE_SPOKEN_FEEDBACK);
     delegate->ToggleSpokenFeedback(A11Y_NOTIFICATION_NONE);
-  } else if (view == high_contrast_view_) {
+  } else if (sender == high_contrast_view_) {
     WmShell::Get()->RecordUserMetricsAction(
         delegate->IsHighContrastEnabled()
             ? ash::UMA_STATUS_AREA_DISABLE_HIGH_CONTRAST
             : ash::UMA_STATUS_AREA_ENABLE_HIGH_CONTRAST);
     delegate->ToggleHighContrast();
-  } else if (view == screen_magnifier_view_) {
+  } else if (sender == screen_magnifier_view_) {
     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_ && view == large_cursor_view_) {
+  } else if (large_cursor_view_ && sender == large_cursor_view_) {
     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_ && view == autoclick_view_) {
+  } else if (autoclick_view_ && sender == autoclick_view_) {
     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_ && view == virtual_keyboard_view_) {
+  } else if (virtual_keyboard_view_ && sender == virtual_keyboard_view_) {
     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::HandleButtonPressed(views::Button* sender,
-                                                    const ui::Event& event) {
+void AccessibilityDetailedView::ButtonPressed(views::Button* sender,
+                                              const ui::Event& event) {
   SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
   if (sender == help_view_)
     tray_delegate->ShowAccessibilityHelp();
   else if (sender == settings_view_)
     tray_delegate->ShowAccessibilitySettings();
 }
 
 }  // namespace tray
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 116 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash