ash: Make sure all the sub-popups retain the same height as the main popup.

ash/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_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #pragma once
 
 #include "ash/launcher/background_animator.h"
 #include "ash/ash_export.h"
@@ skipping 23 matching lines @@
 class UserObserver;
 
 class SystemTrayItem;
 
 namespace internal {
 class SystemTrayBackground;
 class SystemTrayBubble;
 class SystemTrayLayerAnimationObserver;
 }
 
+// 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.
+};
+
 class ASH_EXPORT SystemTray : public internal::ActionableView,
                               public internal::BackgroundAnimatorDelegate {
  public:
   SystemTray();
   virtual ~SystemTray();
 
   // Creates the default set of items for the sytem tray.
   void CreateItems();
 
   // Creates the widget for the tray.
   void CreateWidget();
 
   // Adds a new item in the tray.
   void AddTrayItem(SystemTrayItem* item);
 
   // Removes an existing tray item.
   void RemoveTrayItem(SystemTrayItem* item);
 
   // Shows the default view of all items.
-  void ShowDefaultView();
+  void ShowDefaultView(BubbleCreationType creation_type);
 
   // Shows details of a particular item. If |close_delay_in_seconds| is
   // non-zero, then the view is automatically closed after the specified time.
   void ShowDetailedView(SystemTrayItem* item,
                         int close_delay_in_seconds,
-                        bool activate);
+                        bool activate,
+                        BubbleCreationType creation_type);
 
   // Continue showing the existing detailed view, if any, for |close_delay|
   // seconds.
   void SetDetailedViewCloseDelay(int close_delay);
 
   // Shows the notification view for |item|.
   void ShowNotificationView(SystemTrayItem* item);
 
   // Hides the notification view for |item|.
   void HideNotificationView(SystemTrayItem* item);
@@ skipping 63 matching lines @@
   // Called when the widget associated with |bubble| closes. |bubble| should
   // always == |bubble_|. This triggers destroying |bubble_| and hiding the
   // launcher if necessary.
   void RemoveBubble(internal::SystemTrayBubble* bubble);
 
   const ScopedVector<SystemTrayItem>& items() const { return items_; }
 
   // Constructs or re-constructs |bubble_| and populates it with |items|.
   void ShowItems(const std::vector<SystemTrayItem*>& items,
                  bool details,
-                 bool activate);
+                 bool activate,
+                 BubbleCreationType creation_type);
 
   // Constructs or re-constructs |notification_bubble_| and populates it with
   // |notification_items_|, or destroys it if there are no notification items.
   void UpdateNotificationBubble();
 
   // Called when the anchor (tray or bubble) may have moved or changed.
   void UpdateNotificationAnchor();
 
   // Overridden from internal::ActionableView.
   virtual bool PerformAction(const views::Event& event) OVERRIDE;
@@ skipping 48 matching lines @@
   internal::BackgroundAnimator hover_background_animator_;
   scoped_ptr<internal::SystemTrayLayerAnimationObserver>
       layer_animation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_