Fix Volume slider is captured in screenshot done in touchview mode

ash/common/system/tray/system_tray.h

 // 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.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
 #include "ash/common/system/tray/tray_background_view.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 enum class LoginStatus;
 class ScreenTrayItem;
 class SystemBubbleWrapper;
 class SystemTrayDelegate;
 class SystemTrayItem;
 class TrayAccessibility;
+class TrayAudio;
 class TrayCast;
 class TrayDate;
 class TrayUpdate;
 class TrayUser;
 class WebNotificationTray;
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
@@ skipping 29 matching lines @@
   // non-zero, then the view is automatically closed after the specified time.
   void ShowDetailedView(SystemTrayItem* item,
                         int close_delay_in_seconds,
                         bool activate,
                         BubbleCreationType creation_type);
 
   // Continue showing the existing detailed view, if any, for |close_delay|
   // seconds.
   void SetDetailedViewCloseDelay(int close_delay);
 
-  // Hides the detailed view for |item|.
-  void HideDetailedView(SystemTrayItem* item);
+  // Hides the detailed view for |item|. If |animate| is false, disable
+  // the hiding animation for hiding |item|.
+  void HideDetailedView(SystemTrayItem* item, bool animate);
 
   // Shows the notification view for |item|.
   void ShowNotificationView(SystemTrayItem* item);
 
   // Hides the notification view for |item|.
   void HideNotificationView(SystemTrayItem* item);
 
   // Updates the items when the login status of the system changes.
   void UpdateAfterLoginStatusChange(LoginStatus login_status);
 
@@ skipping 25 matching lines @@
   // Returns true if the mouse is inside the notification bubble.
   bool IsMouseInNotificationBubble() const;
 
   // Closes system bubble and returns true if it did exist.
   bool CloseSystemBubble() const;
 
   // Returns view for help button if default view is shown. Returns NULL
   // otherwise.
   views::View* GetHelpButtonView() const;
 
+  // Accessor for tray audio, can be null if !defined(OS_CHROMEOS).

[Daniel Erat, 2016/08/01 21:10:06]

nit: i wouldn't mention the ifdef here, since it might become out of date. how
about something like this instead?

  // Returns TrayAudio object if present or null otherwise.

[Qiang(Joe) Xu, 2016/08/01 22:56:47]

Done.

+  TrayAudio* GetTrayAudio() const;
+
   // Accessors for testing.
 
   // Returns true if the bubble exists.
   bool CloseNotificationBubbleForTest() const;
 
   // Overridden from TrayBackgroundView.
   void SetShelfAlignment(ShelfAlignment alignment) override;
   void AnchorUpdated() override;
   base::string16 GetAccessibleNameForTray() override;
   void BubbleResized(const views::TrayBubbleView* bubble_view) override;
@@ skipping 106 matching lines @@
 
   // Set to true when system notifications should be hidden (e.g. web
   // notification bubble is visible).
   bool hide_notifications_;
 
   // This is true when the displayed system tray menu is a full tray menu,
   // otherwise a single line item menu like the volume slider is shown.
   // Note that the value is only valid when |system_bubble_| is true.
   bool full_system_tray_menu_;
 
   TrayAccessibility* tray_accessibility_;  // not owned

[Daniel Erat, 2016/08/01 21:10:06]

nit: if none of these are owned, do you mind moving the "not owned" comment to
the previous line so it's at the top of the block?

  // These objects are not owned by this class.
  TrayAccessibility* ...;
  TrayAudio* ...;
  ...

[Qiang(Joe) Xu, 2016/08/01 22:56:47]

Done.

+  TrayAudio* tray_audio_;

[Daniel Erat, 2016/08/01 21:10:06]

nit: document that this may be null, e.g.

  TrayAudio* tray_audio_;  // May be null.

[Qiang(Joe) Xu, 2016/08/01 22:56:47]

Done.

   TrayCast* tray_cast_;
   TrayDate* tray_date_;
   TrayUpdate* tray_update_;
 
   // A reference to the Screen share and capture item.
   ScreenTrayItem* screen_capture_tray_item_;  // not owned
   ScreenTrayItem* screen_share_tray_item_;    // not owned
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_