Make TrayDetailsView a ViewClickListener and ButtonListener

ash/common/system/chromeos/bluetooth/tray_bluetooth.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/chromeos/bluetooth/tray_bluetooth.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
-#include "ash/common/system/tray/view_click_listener.h"
 #include "ash/common/wm_shell.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/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 70 matching lines @@
       SetVisible(true);
     } else {
       SetVisible(false);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView);
 };
 
-class BluetoothDetailedView : public TrayDetailsView,
-                              public ViewClickListener,
-                              public views::ButtonListener {
+class BluetoothDetailedView : public TrayDetailsView {
  public:
   BluetoothDetailedView(SystemTrayItem* owner, LoginStatus login)
       : TrayDetailsView(owner),
         login_(login),
-        manage_devices_(NULL),
-        toggle_bluetooth_(NULL),
-        enable_bluetooth_(NULL) {
+        manage_devices_(nullptr),
+        toggle_bluetooth_(nullptr),
+        enable_bluetooth_(nullptr) {
     CreateItems();
   }
 
   ~BluetoothDetailedView() override {
     // Stop discovering bluetooth devices when exiting BT detailed view.
     BluetoothStopDiscovering();
   }
 
   void Update() {
     BluetoothStartDiscovering();
     UpdateBluetoothDeviceList();
 
     // Update UI.
     UpdateDeviceScrollList();
     UpdateHeaderEntry();
     Layout();
   }
 
  private:
   void CreateItems() {
     CreateScrollableList();
     AppendSettingsEntries();
-    AppendHeaderEntry();
+    CreateTitleRow(IDS_ASH_STATUS_TRAY_BLUETOOTH, this);
   }
 
   void BluetoothStartDiscovering() {
+    // TODO(tdanderson|fukino): The material design version of the detailed
+    // view should use an infinite loader bar instead of a throbber. See
+    // crbug.com/632128.
+    const bool md = MaterialDesignController::IsSystemTrayMenuMaterial();

[varkha, 2016/08/31 20:28:13]

nit: s/md/material for consistency and I thought we frown upon abbreviations?

[tdanderson, 2016/08/31 22:24:15]

Removed.

     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
-    bool bluetooth_enabled = delegate->GetBluetoothEnabled();
-    bool bluetooth_discovering = delegate->GetBluetoothDiscovering();
-    if (bluetooth_discovering) {
-      throbber_->Start();
+    if (delegate->GetBluetoothDiscovering()) {
+      if (!md)

[varkha, 2016/08/31 20:28:14]

What do you think about replacing this with "if (throbber_)"? Just as easy to
remove in future and concentrates use of MDC where the controls are created.

[tdanderson, 2016/08/31 22:24:15]

Good idea, changed.

+        throbber_->Start();
       return;
     }
-    throbber_->Stop();
-    if (bluetooth_enabled) {
+    if (!md)

[varkha, 2016/08/31 20:28:14]

ditto.

[tdanderson, 2016/08/31 22:24:15]

Done.

+      throbber_->Stop();
+    if (delegate->GetBluetoothEnabled())
       delegate->BluetoothStartDiscovering();
-    }
   }
 
   void BluetoothStopDiscovering() {
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     if (delegate && delegate->GetBluetoothDiscovering()) {
       delegate->BluetoothStopDiscovering();
-      throbber_->Stop();
+      if (!MaterialDesignController::IsSystemTrayMenuMaterial())

[varkha, 2016/08/31 20:28:14]

ditto.

[tdanderson, 2016/08/31 22:24:15]

Done.

+        throbber_->Stop();
     }
   }
 
   void UpdateBluetoothDeviceList() {
     std::set<std::string> new_connecting_devices;
     std::set<std::string> new_connected_devices;
     std::set<std::string> new_paired_not_connected_devices;
     std::set<std::string> new_discovered_not_paired_devices;
 
     BluetoothDeviceList list;
@@ skipping 20 matching lines @@
     RemoveObsoleteBluetoothDevicesFromList(&connecting_devices_,
                                            new_connecting_devices);
     RemoveObsoleteBluetoothDevicesFromList(&connected_devices_,
                                            new_connected_devices);
     RemoveObsoleteBluetoothDevicesFromList(&paired_not_connected_devices_,
                                            new_paired_not_connected_devices);
     RemoveObsoleteBluetoothDevicesFromList(&discovered_not_paired_devices_,
                                            new_discovered_not_paired_devices);
   }
 
-  void AppendHeaderEntry() {
-    CreateSpecialRow(IDS_ASH_STATUS_TRAY_BLUETOOTH, this);
-
-    if (login_ == LoginStatus::LOCKED)
-      return;
-
-    throbber_ = new ThrobberView;
-    throbber_->SetTooltipText(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING));
-    footer()->AddView(throbber_, false /* separator */);
-
-    // Do not allow toggling bluetooth in the lock screen.
-    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
-    toggle_bluetooth_ =
-        new TrayPopupHeaderButton(this, IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
-                                  IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
-                                  IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER,
-                                  IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER,
-                                  IDS_ASH_STATUS_TRAY_BLUETOOTH);
-    toggle_bluetooth_->SetToggled(!delegate->GetBluetoothEnabled());
-    toggle_bluetooth_->SetTooltipText(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISABLE_BLUETOOTH));
-    toggle_bluetooth_->SetToggledTooltipText(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH));
-    toggle_bluetooth_->EnableCanvasFlippingForRTLUI(false);
-    footer()->AddButton(toggle_bluetooth_);
-  }
-
   void UpdateHeaderEntry() {
     if (toggle_bluetooth_) {
       toggle_bluetooth_->SetToggled(
           !WmShell::Get()->system_tray_delegate()->GetBluetoothEnabled());
     }
   }
 
   void UpdateDeviceScrollList() {
     device_map_.clear();
     scroll_content()->RemoveAllChildViews(true);
-    enable_bluetooth_ = NULL;
+    enable_bluetooth_ = nullptr;
 
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     bool bluetooth_enabled = delegate->GetBluetoothEnabled();
     bool blueooth_available = delegate->GetBluetoothAvailable();
     if (blueooth_available && !bluetooth_enabled && toggle_bluetooth_) {
       enable_bluetooth_ = AddScrollListItem(
           l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH),
           false /* highlight */, false /* checked */, true /* enabled */);
     }
 
@@ skipping 93 matching lines @@
           IDS_ASH_STATUS_TRAY_BLUETOOTH_CONNECTING, display_name);
 
       item_container->RemoveAllChildViews(true);
       static_cast<HoverHighlightView*>(item_container)
           ->AddCheckableLabel(display_name, true /* highlight */, false);
       scroll_content()->SizeToPreferredSize();
       static_cast<views::View*>(scroller())->Layout();
     }
   }
 
-  // Overridden from ViewClickListener.
-  void OnViewClicked(views::View* sender) override {
+  // TrayDetailsView:
+  void HandleViewClicked(views::View* view) override {
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
-    if (sender == footer()->content()) {
-      TransitionToDefaultView();
-    } else if (sender == manage_devices_) {
+    if (view == manage_devices_) {
       delegate->ManageBluetoothDevices();
-    } else if (sender == enable_bluetooth_) {
+      return;
+    }
+
+    if (view == enable_bluetooth_) {
       WmShell::Get()->RecordUserMetricsAction(
           delegate->GetBluetoothEnabled() ? UMA_STATUS_AREA_BLUETOOTH_DISABLED
                                           : UMA_STATUS_AREA_BLUETOOTH_ENABLED);
       delegate->ToggleBluetooth();
-    } else {
-      if (!delegate->GetBluetoothEnabled())
-        return;
-      std::map<views::View*, std::string>::iterator find;
-      find = device_map_.find(sender);
-      if (find == device_map_.end())
-        return;
-      const std::string device_id = find->second;
-      if (FoundDevice(device_id, connecting_devices_, NULL))
-        return;
-      UpdateClickedDevice(device_id, sender);
-      delegate->ConnectToBluetoothDevice(device_id);
+      return;
     }
+
+    if (!delegate->GetBluetoothEnabled())
+      return;
+
+    std::map<views::View*, std::string>::iterator find;
+    find = device_map_.find(view);
+    if (find == device_map_.end())
+      return;
+
+    const std::string device_id = find->second;
+    if (FoundDevice(device_id, connecting_devices_, nullptr))
+      return;
+
+    UpdateClickedDevice(device_id, view);
+    delegate->ConnectToBluetoothDevice(device_id);
   }
 
-  // Overridden from ButtonListener.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
+  void HandleButtonPressed(views::Button* sender,
+                           const ui::Event& event) override {
+    if (MaterialDesignController::IsSystemTrayMenuMaterial())
+      return;
+
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     if (sender == toggle_bluetooth_)
       delegate->ToggleBluetooth();
     else
       NOTREACHED();
   }
 
+  void CreateExtraTitleRowButtons() override {
+    // TODO(tdanderson|fukino): The material design version of the detailed
+    // view requires different buttons. See crbug.com/632128.
+    if (MaterialDesignController::IsSystemTrayMenuMaterial())
+      return;
+
+    if (login_ == LoginStatus::LOCKED)
+      return;
+
+    throbber_ = new ThrobberView;
+    throbber_->SetTooltipText(
+        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING));
+    title_row()->AddView(throbber_, false /* separator */);
+
+    // Do not allow toggling bluetooth in the lock screen.
+    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+    toggle_bluetooth_ =
+        new TrayPopupHeaderButton(this, IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
+                                  IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
+                                  IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER,
+                                  IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER,
+                                  IDS_ASH_STATUS_TRAY_BLUETOOTH);
+    toggle_bluetooth_->SetToggled(!delegate->GetBluetoothEnabled());
+    toggle_bluetooth_->SetTooltipText(
+        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISABLE_BLUETOOTH));
+    toggle_bluetooth_->SetToggledTooltipText(
+        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH));
+    toggle_bluetooth_->EnableCanvasFlippingForRTLUI(false);
+    title_row()->AddButton(toggle_bluetooth_);
+  }
+
   LoginStatus login_;
 
   std::map<views::View*, std::string> device_map_;
   views::View* manage_devices_;
+
+  // Not used in material design.
   ThrobberView* throbber_;
+
+  // Not used in material design.
   TrayPopupHeaderButton* toggle_bluetooth_;
+
   HoverHighlightView* enable_bluetooth_;
   BluetoothDeviceList connected_devices_;
   BluetoothDeviceList connecting_devices_;
   BluetoothDeviceList paired_not_connected_devices_;
   BluetoothDeviceList discovered_not_paired_devices_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView);
 };
 
 }  // namespace tray
@@ skipping 50 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash