Remove Chromecast extension support from cast system tray menu.

ash/common/system/chromeos/cast/tray_cast.cc

 // Copyright 2015 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/cast/tray_cast.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
@@ skipping 295 matching lines @@
 }
 
 CastTrayView::~CastTrayView() {}
 
 // This view displays a list of cast receivers that can be clicked on and casted
 // to. It is activated by clicking on the chevron inside of
 // |CastSelectDefaultView|.
 class CastDetailedView : public TrayDetailsView {
  public:
   CastDetailedView(SystemTrayItem* owner,
-                   LoginStatus login,
                    const CastConfigDelegate::ReceiversAndActivities&
                        receivers_and_activities);
   ~CastDetailedView() override;
 
   // Makes the detail view think the view associated with the given receiver_id
   // was clicked. This will start a cast.
   void SimulateViewClickedForTest(const std::string& receiver_id);
 
   // Updates the list of available receivers.
   void UpdateReceiverList(const CastConfigDelegate::ReceiversAndActivities&
                               new_receivers_and_activities);
 
  private:
   void CreateItems();
 
   void UpdateReceiverListFromCachedData();
   views::View* AddToReceiverList(
       const CastConfigDelegate::ReceiverAndActivity& receiverActivity);
 
-  void AppendSettingsEntries();
-
   // TrayDetailsView:
   void HandleViewClicked(views::View* view) override;
 
-  LoginStatus login_;
-  views::View* options_ = nullptr;
   // A mapping from the receiver id to the receiver/activity data.
   std::map<std::string, CastConfigDelegate::ReceiverAndActivity>
       receivers_and_activities_;
   // A mapping from the view pointer to the associated activity id.
   std::map<views::View*, std::string> receiver_activity_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CastDetailedView);
 };
 
 CastDetailedView::CastDetailedView(
     SystemTrayItem* owner,
-    LoginStatus login,
     const CastConfigDelegate::ReceiversAndActivities& receivers_and_activities)
-    : TrayDetailsView(owner), login_(login) {
+    : TrayDetailsView(owner) {
   CreateItems();
   UpdateReceiverList(receivers_and_activities);
 }
 
 CastDetailedView::~CastDetailedView() {}
 
 void CastDetailedView::SimulateViewClickedForTest(
     const std::string& receiver_id) {
   for (auto& it : receiver_activity_map_) {
     if (it.second == receiver_id) {
       HandleViewClicked(it.first);
       break;
     }
   }
 }
 
 void CastDetailedView::CreateItems() {
   CreateScrollableList();
-  if (GetCastConfigDelegate()->HasOptions())
-    AppendSettingsEntries();
   CreateTitleRow(IDS_ASH_STATUS_TRAY_CAST);
 }
 
 void CastDetailedView::UpdateReceiverList(
     const CastConfigDelegate::ReceiversAndActivities&
         new_receivers_and_activities) {
   // Add/update existing.
   for (auto i = new_receivers_and_activities.begin();
        i != new_receivers_and_activities.end(); ++i) {
     receivers_and_activities_[i->receiver.id] = *i;
@@ skipping 47 matching lines @@
           .ToImageSkia();
   const base::string16& name = receiverActivity.receiver.name;
   container->AddIconAndLabelCustomSize(
       *image, name, false, kTrayPopupDetailsIconWidth,
       kTrayPopupPaddingHorizontal, kTrayPopupPaddingBetweenItems);
 
   scroll_content()->AddChildView(container);
   return container;
 }
 
-void CastDetailedView::AppendSettingsEntries() {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  // Settings requires a browser window, hide it for non logged in user.
-  if (login_ == LoginStatus::NOT_LOGGED_IN || login_ == LoginStatus::LOCKED ||
-      WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
-    return;
-  }
-
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  HoverHighlightView* container = new HoverHighlightView(this);
-  container->AddLabel(rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_CAST_OPTIONS),
-                      gfx::ALIGN_LEFT, false /* highlight */);
-
-  AddChildView(container);
-  options_ = container;
-}
-
 void CastDetailedView::HandleViewClicked(views::View* view) {
-  if (view == options_) {
-    GetCastConfigDelegate()->LaunchCastOptions();
-    return;
-  }
-
   // Find the receiver we are going to cast to.
   auto it = receiver_activity_map_.find(view);
   if (it != receiver_activity_map_.end()) {
     GetCastConfigDelegate()->CastToReceiver(it->second);
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST);
   }
 }
 
 }  // namespace tray
@@ skipping 29 matching lines @@
 views::View* TrayCast::CreateTrayView(LoginStatus status) {
   CHECK(tray_ == nullptr);
   tray_ = new tray::CastTrayView(this);
   tray_->SetVisible(is_casting_);
   return tray_;
 }
 
 views::View* TrayCast::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == nullptr);
 
-  if (HasCastExtension()) {
-    CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
-
+  CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
+  if (cast_config_delegate) {
     // Add the cast observer here instead of the ctor for two reasons:
     // - The ctor gets called too early in the initialization cycle (at least
     //   for the tests); the correct profile hasn't been setup yet.
     // - If we're using the cast extension backend (media router is disabled),
     //   then the user can install the extension at any point in time. The
     //   return value of HasCastExtension() can change, so only checking it in
     //   the ctor isn't enough.
     if (!added_observer_) {
       cast_config_delegate->AddObserver(this);
       added_observer_ = true;
@@ skipping 10 matching lines @@
   default_->select_view()->set_id(SELECT_VIEW);
   default_->cast_view()->set_id(CAST_VIEW);
 
   UpdatePrimaryView();
   return default_;
 }
 
 views::View* TrayCast::CreateDetailedView(LoginStatus status) {
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_CAST_VIEW);
   CHECK(detailed_ == nullptr);
-  detailed_ =
-      new tray::CastDetailedView(this, status, receivers_and_activities_);
+  detailed_ = new tray::CastDetailedView(this, receivers_and_activities_);
   return detailed_;
 }
 
 void TrayCast::DestroyTrayView() {
   tray_ = nullptr;
 }
 
 void TrayCast::DestroyDefaultView() {
   default_ = nullptr;
 }
 
 void TrayCast::DestroyDetailedView() {
   detailed_ = nullptr;
 }
 
-bool TrayCast::HasCastExtension() {
-  CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
-  return cast_config_delegate != nullptr &&
-         cast_config_delegate->HasCastExtension();
-}
-
 void TrayCast::OnDevicesUpdated(
     const CastConfigDelegate::ReceiversAndActivities& receivers_activities) {
   receivers_and_activities_ = receivers_activities;
 
   if (default_) {
     bool has_receivers = !receivers_and_activities_.empty();
     default_->SetVisible(has_receivers);
     default_->cast_view()->UpdateLabel(receivers_and_activities_);
   }
   if (detailed_)
     detailed_->UpdateReceiverList(receivers_and_activities_);
 }
 
 void TrayCast::UpdatePrimaryView() {
-  if (HasCastExtension() && !receivers_and_activities_.empty()) {
+  if (GetCastConfigDelegate() && !receivers_and_activities_.empty()) {
     if (default_) {
       if (is_casting_)
         default_->ActivateCastView();
       else
         default_->ActivateSelectView();
     }
 
     if (tray_)
       tray_->SetVisible(is_casting_);
   } else {
     if (default_)
       default_->SetVisible(false);
     if (tray_)
       tray_->SetVisible(false);
   }
 }
 
 void TrayCast::OnCastingSessionStartedOrStopped(bool started) {
   is_casting_ = started;
   UpdatePrimaryView();
 }
 
 }  // namespace ash