Implement all system menu title row buttons for Ash MD

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/tray_popup_item_style.h"
+#include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "device/bluetooth/bluetooth_common.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/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ skipping 140 matching lines @@
 
 class BluetoothDetailedView : public TrayDetailsView {
  public:
   BluetoothDetailedView(SystemTrayItem* owner, LoginStatus login)
       : TrayDetailsView(owner),
         login_(login),
         manage_devices_(nullptr),
         throbber_(nullptr),
         toggle_bluetooth_(nullptr),
         enable_bluetooth_(nullptr),
-        toggle_(nullptr) {
+        toggle_(nullptr),
+        settings_(nullptr) {
     CreateItems();
   }
 
   ~BluetoothDetailedView() override {
     // Stop discovering bluetooth devices when exiting BT detailed view.
     BluetoothStopDiscovering();
   }
 
   void Update() {
     BluetoothStartDiscovering();
@@ skipping 170 matching lines @@
         CreateVectorIcon(gfx::VectorIconId::CHECK_CIRCLE, gfx::kGoogleGreen700);
     container->AddRightIcon(check_mark, check_mark.width());
     container->SetRightIconVisible(checked);
     container->text_label()->SetEnabled(enabled);
     scroll_content()->AddChildView(container);
     return container;
   }
 
   // Add settings entries.
   void AppendSettingsEntries() {
+    // Do not append the bottom button row in material design; this is replaced
+    // by the settings button in the header row.
+    if (MaterialDesignController::IsSystemTrayMenuMaterial())
+      return;
+
     if (!WmShell::Get()->system_tray_delegate()->ShouldShowSettings())
       return;
 
     // Add bluetooth device requires a browser window, hide it for non logged in
     // user.
-    if (login_ == LoginStatus::NOT_LOGGED_IN || login_ == LoginStatus::LOCKED ||
-        WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
+    if (!CanOpenWebUISettings(login_))
       return;
-    }
 
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     HoverHighlightView* container = new HoverHighlightView(this);
     container->AddLabel(
         rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BLUETOOTH_MANAGE_DEVICES),
         gfx::ALIGN_LEFT, false /* highlight */);
     container->SetEnabled(delegate->GetBluetoothAvailable());
     AddChildView(container);
     manage_devices_ = container;
@@ skipping 27 matching lines @@
       item_container->RemoveAllChildViews(true);
       static_cast<HoverHighlightView*>(item_container)
           ->AddCheckableLabel(display_name, true /* highlight */, false);
       scroll_content()->SizeToPreferredSize();
       static_cast<views::View*>(scroller())->Layout();
     }
   }
 
   // TrayDetailsView:
   void HandleViewClicked(views::View* view) override {
-    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     if (view == manage_devices_) {
-      delegate->ManageBluetoothDevices();
-      owner()->system_tray()->CloseSystemBubble();
+      ShowSettings();
       return;
     }
 
+    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     if (view == enable_bluetooth_) {
       WmShell::Get()->RecordUserMetricsAction(
           delegate->GetBluetoothEnabled() ? UMA_STATUS_AREA_BLUETOOTH_DISABLED
                                           : UMA_STATUS_AREA_BLUETOOTH_ENABLED);
       delegate->ToggleBluetooth();
       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);
   }
 
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       if (sender == toggle_)
         WmShell::Get()->system_tray_delegate()->ToggleBluetooth();
+      else if (sender == settings_)
+        ShowSettings();
       else
         NOTREACHED();
       return;
     }
 
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     if (sender == toggle_bluetooth_)
       delegate->ToggleBluetooth();
     else
       NOTREACHED();
   }
 
   void CreateExtraTitleRowButtons() override {
     if (login_ == LoginStatus::LOCKED)
       return;
 
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       toggle_ = title_row()->AddToggleButton(this);
+      settings_ = title_row()->AddSettingsButton(this, login_);
       return;
     }
 
     throbber_ = new ThrobberView;
     throbber_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING));
     title_row()->AddViewToRowNonMd(throbber_, false);
 
     // 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()->AddViewToRowNonMd(toggle_bluetooth_, true);
   }
 
+  void ShowSettings() {
+    if (CanOpenWebUISettings(login_)) {
+      WmShell::Get()->system_tray_delegate()->ManageBluetoothDevices();
+      owner()->system_tray()->CloseSystemBubble();
+    }
+  }
+
   LoginStatus login_;
 
   std::map<views::View*, std::string> device_map_;
+
+  // Not used in material design.
   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_;
 
   // The on/off toggle button used in material design.
   views::ToggleButton* toggle_;
 
+  // Only used in material design.
+  views::Button* settings_;
+
   DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView);
 };
 
 }  // namespace tray
 
 TrayBluetooth::TrayBluetooth(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_BLUETOOTH),
       default_(nullptr),
       detailed_(nullptr) {
   WmShell::Get()->system_tray_notifier()->AddBluetoothObserver(this);
@@ skipping 45 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash