Revert of Make TrayDetailsView a ViewClickListener and ButtonListener

ash/common/system/ime/tray_ime_chromeos.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/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 99 matching lines @@
 
   ~IMEDetailedView() override {}
 
   void Update(const IMEInfoList& list,
               const IMEPropertyInfoList& property_list,
               bool show_keyboard_toggle,
               SingleImeBehavior single_ime_behavior) override {
     ImeListView::Update(list, property_list, show_keyboard_toggle,
                         single_ime_behavior);
     if (login_ != LoginStatus::NOT_LOGGED_IN && login_ != LoginStatus::LOCKED &&
-        !WmShell::Get()
-             ->GetSessionStateDelegate()
-             ->IsInSecondaryLoginScreen()) {
+        !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen())
       AppendSettings();
-    }
-
-    CreateTitleRow(IDS_ASH_STATUS_TRAY_IME);
+    AppendHeaderEntry();
   }
 
  private:
   // ImeListView:
-  void HandleViewClicked(views::View* view) override {
-    ImeListView::HandleViewClicked(view);
-    if (view == settings_) {
+  void OnViewClicked(views::View* sender) override {
+    ImeListView::OnViewClicked(sender);
+    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+    if (sender == footer()->content()) {
+      TransitionToDefaultView();
+    } else if (sender == settings_) {
       WmShell::Get()->RecordUserMetricsAction(
           UMA_STATUS_AREA_IME_SHOW_DETAILED);
-      WmShell::Get()->system_tray_delegate()->ShowIMESettings();
+      delegate->ShowIMESettings();
     }
   }
 
+  void AppendHeaderEntry() { CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this); }
+
   void AppendSettings() {
     HoverHighlightView* container = new HoverHighlightView(this);
     container->AddLabel(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_ASH_STATUS_TRAY_IME_SETTINGS),
         gfx::ALIGN_LEFT, false /* highlight */);
     AddChildView(container);
     settings_ = container;
   }
 
@@ skipping 148 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash