Implement all system menu title row buttons for Ash MD

ash/common/system/tray/tray_details_view.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/tray_details_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
@@ skipping 48 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ScrollBorder);
 };
 
 TrayDetailsView::TrayDetailsView(SystemTrayItem* owner)
     : owner_(owner),
       title_row_(nullptr),
       scroller_(nullptr),
       scroll_content_(nullptr),
       scroll_border_(nullptr),
-      back_button_(nullptr),
-      settings_button_(nullptr) {
+      back_button_(nullptr) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 }
 
 TrayDetailsView::~TrayDetailsView() {}
 
 void TrayDetailsView::OnViewClicked(views::View* sender) {
   if (!MaterialDesignController::IsSystemTrayMenuMaterial() && title_row_ &&
       sender == title_row_->content()) {
     TransitionToDefaultView();
     return;
   }
 
   HandleViewClicked(sender);
 }
 
 void TrayDetailsView::ButtonPressed(views::Button* sender,
                                     const ui::Event& event) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    if (sender == back_button_) {
-      TransitionToDefaultView();
-      return;
-    } else if (sender == settings_button_) {
-      ShowSettings();
-      return;
-    }
+  if (MaterialDesignController::IsSystemTrayMenuMaterial() &&
+      sender == back_button_) {
+    TransitionToDefaultView();
+    return;
   }
 
   HandleButtonPressed(sender, event);
 }
 
 void TrayDetailsView::CreateTitleRow(int string_id) {
   DCHECK(!title_row_);
   const int child_view_position =
       MaterialDesignController::IsSystemTrayMenuMaterial() ? 0 : child_count();
   title_row_ = new SpecialPopupRow();
   title_row_->SetTextLabel(string_id, this);
 
   AddChildViewAt(title_row_, child_view_position);
 
   CreateExtraTitleRowButtons();
 
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
     back_button_ = title_row_->AddBackButton(this);
-    settings_button_ = title_row_->AddSettingsButton(this);
-  }
 
   Layout();
 }
 
 void TrayDetailsView::CreateScrollableList() {
   DCHECK(!scroller_);
   scroll_content_ = new views::View;
   scroll_content_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
   scroller_ = new FixedSizedScrollView;
@@ skipping 13 matching lines @@
   if (scroll_content_->has_children())
     scroll_content_->AddChildView(new ScrollSeparator);
 }
 
 void TrayDetailsView::Reset() {
   RemoveAllChildViews(true);
   title_row_ = nullptr;
   scroller_ = nullptr;
   scroll_content_ = nullptr;
   back_button_ = nullptr;
-  settings_button_ = nullptr;
 }
 
 void TrayDetailsView::HandleViewClicked(views::View* view) {}
 
 void TrayDetailsView::HandleButtonPressed(views::Button* sender,
                                           const ui::Event& event) {}
 
 void TrayDetailsView::CreateExtraTitleRowButtons() {}
 
-void TrayDetailsView::ShowSettings() {
-  // TODO(tdanderson): Store login status as a member in TrayDetailsView
-  // instead of its derived classes. Use this to perform an early return
-  // if launching WebUI settings is not permitted, and provide a default
-  // implementation to ShowSettings().
-}
-
 void TrayDetailsView::TransitionToDefaultView() {
   // Cache pointer to owner in this function scope. TrayDetailsView will be
   // deleted after called ShowDefaultView.
   SystemTrayItem* owner = owner_;
   if (title_row_ && title_row_->content() && title_row_->content()->HasFocus())
     owner->set_restore_focus(true);
   owner->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   owner->set_restore_focus(false);
 }
 
@@ skipping 32 matching lines @@
     if (index < child_count() - 1 && child_at(index + 1) != title_row_)
       scroll_border_->set_visible(true);
     else
       scroll_border_->set_visible(false);
   }
 
   views::View::OnPaintBorder(canvas);
 }
 
 }  // namespace ash