Fix Volume slider is captured in screenshot done in touchview mode

ash/common/system/tray/system_tray.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/system_tray.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 24 matching lines @@
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h"
 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
 #include "ash/common/system/chromeos/brightness/tray_brightness.h"
 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_item.h"
 #include "ash/common/system/chromeos/network/tray_network.h"
 #include "ash/common/system/chromeos/network/tray_sms.h"
 #include "ash/common/system/chromeos/network/tray_vpn.h"
@@ skipping 67 matching lines @@
 // SystemTray
 
 SystemTray::SystemTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       web_notification_tray_(nullptr),
       detailed_item_(nullptr),
       default_bubble_height_(0),
       hide_notifications_(false),
       full_system_tray_menu_(false),
       tray_accessibility_(nullptr),
+      tray_audio_(nullptr),
       tray_cast_(nullptr),
       tray_date_(nullptr),
       tray_update_(nullptr),
       screen_capture_tray_item_(nullptr),
       screen_share_tray_item_(nullptr) {
   SetContentsBackground();
 }
 
 SystemTray::~SystemTray() {
   // Destroy any child views that might have back pointers before ~View().
@@ skipping 57 matching lines @@
   // and we have a DisplayManager equivalent. See http://crbug.com/548429
   std::unique_ptr<SystemTrayItem> tray_display =
       delegate->CreateDisplayTrayItem(this);
   if (tray_display)
     AddTrayItem(tray_display.release());
   screen_capture_tray_item_ = new ScreenCaptureTrayItem(this);
   AddTrayItem(screen_capture_tray_item_);
   screen_share_tray_item_ = new ScreenShareTrayItem(this);
   AddTrayItem(screen_share_tray_item_);
   AddTrayItem(new MultiProfileMediaTrayItem(this));
-  AddTrayItem(new TrayAudioChromeOs(this));
+  tray_audio_ = new TrayAudioChromeOs(this);
+  AddTrayItem(tray_audio_);
   AddTrayItem(new TrayBrightness(this));
   AddTrayItem(new TrayCapsLock(this));
   // TODO(jamescook): Remove this when mus has support for display management
   // and we have a DisplayManager equivalent. See http://crbug.com/548429
   std::unique_ptr<SystemTrayItem> tray_rotation_lock =
       delegate->CreateRotationLockTrayItem(this);
   if (tray_rotation_lock)
     AddTrayItem(tray_rotation_lock.release());
   AddTrayItem(new TraySettings(this));
   AddTrayItem(tray_update_);
@@ skipping 50 matching lines @@
             persistent);
   if (system_bubble_)
     system_bubble_->bubble()->StartAutoCloseTimer(close_delay);
 }
 
 void SystemTray::SetDetailedViewCloseDelay(int close_delay) {
   if (HasSystemBubbleType(SystemTrayBubble::BUBBLE_TYPE_DETAILED))
     system_bubble_->bubble()->StartAutoCloseTimer(close_delay);
 }
 
-void SystemTray::HideDetailedView(SystemTrayItem* item) {
+void SystemTray::HideDetailedView(SystemTrayItem* item, bool animate) {
   if (item != detailed_item_)
     return;
+
+  if (!animate) {
+    // In unittest, GetSystemBubble might return nullptr.
+    if (GetSystemBubble()) {
+      GetSystemBubble()
+          ->bubble_view()
+          ->GetWidget()
+          ->SetVisibilityAnimationTransition(
+              views::Widget::VisibilityTransition::ANIMATE_NONE);
+    }
+  }
+
   DestroySystemBubble();
   UpdateNotificationBubble();
 }
 
 void SystemTray::ShowNotificationView(SystemTrayItem* item) {
   if (std::find(notification_items_.begin(), notification_items_.end(), item) !=
       notification_items_.end())
     return;
   notification_items_.push_back(item);
   UpdateNotificationBubble();
@@ skipping 72 matching lines @@
   if (!system_bubble_)
     return false;
   system_bubble_->bubble()->Close();
   return true;
 }
 
 views::View* SystemTray::GetHelpButtonView() const {
   return tray_date_->GetHelpButtonView();
 }
 
+TrayAudio* SystemTray::GetTrayAudio() const {
+  return tray_audio_;
+}
+
 bool SystemTray::CloseNotificationBubbleForTest() const {
   if (!notification_bubble_)
     return false;
   notification_bubble_->bubble()->Close();
   return true;
 }
 
 // Private methods.
 
 bool SystemTray::HasSystemBubbleType(SystemTrayBubble::BubbleType type) {
@@ skipping 384 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash