Migrate simple ash Shell metrics users.

ash/system/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/system/cast/tray_cast.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/fixed_sized_image_view.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_delegate.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_item_view.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
-#include "ash/shell.h"
 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/bind.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/text_elider.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 
 namespace {
 
 const size_t kMaximumStatusStringLength = 100;
 const int kStopButtonRightPadding = 18;
 
 // Returns the active CastConfigDelegate instance.
-ash::CastConfigDelegate* GetCastConfigDelegate() {
+CastConfigDelegate* GetCastConfigDelegate() {
   return WmShell::Get()->system_tray_delegate()->GetCastConfigDelegate();
 }
 
 // Helper method to elide the given string to the maximum length. If a string is
 // contains user-input and is displayed, we should elide it.
 // TODO(jdufault): This does not properly trim unicode characters. We should
 // implement this properly by using views::Label::SetElideBehavior(...). See
 // crbug.com/532496.
 base::string16 ElideString(const base::string16& text) {
   base::string16 elided;
@@ skipping 132 matching lines @@
   if (label_->bounds().Intersects(stop_button_->bounds())) {
     gfx::Rect label_bounds = label_->bounds();
     label_bounds.set_width(stop_button_->x() - kTrayPopupPaddingBetweenItems -
                            label_->x());
     label_->SetBoundsRect(label_bounds);
   }
 }
 
 void CastCastView::StopCasting() {
   GetCastConfigDelegate()->StopCasting(displayed_activity_id_);
-  Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-      ash::UMA_STATUS_AREA_CAST_STOP_CAST);
+  WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAST_STOP_CAST);
 }
 
 void CastCastView::UpdateLabel(
     const CastConfigDelegate::ReceiversAndActivities& receivers_activities) {
   for (auto& i : receivers_activities) {
     const CastConfigDelegate::Receiver& receiver = i.receiver;
     const CastConfigDelegate::Activity& activity = i.activity;
 
     if (!activity.id.empty()) {
       displayed_activity_id_ = activity.id;
@@ skipping 282 matching lines @@
           .ToImageSkia();
   const base::string16& name = receiverActivity.receiver.name;
   container->AddIndentedIconAndLabel(*image, name, false);
 
   scroll_content()->AddChildView(container);
   return container;
 }
 
 void CastDetailedView::AppendSettingsEntries() {
   // Settings requires a browser window, hide it for non logged in user.
-  const bool userAddingRunning = Shell::GetInstance()
-                                     ->session_state_delegate()
-                                     ->IsInSecondaryLoginScreen();
-
   if (login_ == LoginStatus::NOT_LOGGED_IN || login_ == LoginStatus::LOCKED ||
-      userAddingRunning)
+      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::AppendHeaderEntry() {
   CreateSpecialRow(IDS_ASH_STATUS_TRAY_CAST, this);
 }
 
 void CastDetailedView::OnViewClicked(views::View* sender) {
-  ash::CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
+  CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
 
   if (sender == footer()->content()) {
     TransitionToDefaultView();
   } else if (sender == options_) {
     cast_config_delegate->LaunchCastOptions();
   } else {
     // Find the receiver we are going to cast to
     auto it = receiver_activity_map_.find(sender);
     if (it != receiver_activity_map_.end()) {
       cast_config_delegate->CastToReceiver(it->second);
-      Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-          ash::UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST);
+      WmShell::Get()->RecordUserMetricsAction(
+          UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST);
     }
   }
 }
 
 }  // namespace tray
 
 TrayCast::TrayCast(SystemTray* system_tray) : SystemTrayItem(system_tray) {
   WmShell::Get()->AddShellObserver(this);
 }
 
@@ skipping 24 matching lines @@
   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()) {
-    ash::CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
+    CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
 
     // 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;
     }
 
     // The extension updates its view model whenever the popup is opened, so we
     // probably should as well.
     cast_config_delegate->RequestDeviceRefresh();
   }
 
   default_ = new tray::CastDuplexView(this, status != LoginStatus::LOCKED,
                                       receivers_and_activities_);
   default_->set_id(TRAY_VIEW);
   default_->select_view()->set_id(SELECT_VIEW);
   default_->cast_view()->set_id(CAST_VIEW);
 
   UpdatePrimaryView();
   return default_;
 }
 
 views::View* TrayCast::CreateDetailedView(LoginStatus status) {
-  Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-      ash::UMA_STATUS_AREA_DETAILED_CAST_VIEW);
+  WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_CAST_VIEW);
   CHECK(detailed_ == nullptr);
   detailed_ =
       new tray::CastDetailedView(this, status, receivers_and_activities_);
   return detailed_;
 }
 
 void TrayCast::DestroyTrayView() {
   tray_ = nullptr;
 }
 
 void TrayCast::DestroyDefaultView() {
   default_ = nullptr;
 }
 
 void TrayCast::DestroyDetailedView() {
   detailed_ = nullptr;
 }
 
 bool TrayCast::HasCastExtension() {
-  ash::CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
+  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();
@@ skipping 27 matching lines @@
   is_casting_ = started;
   UpdatePrimaryView();
 }
 
 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (tray_)
     tray_->UpdateAlignment(alignment);
 }
 
 }  // namespace ash