Remove system tray specific code and arrow logic from SystemTrayBubbleView.

ash/system/tray/system_tray_bubble.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_BUBBLE_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
 #pragma once
 
 #include "ash/system/user/login_status.h"
 #include "ash/wm/shelf_auto_hide_behavior.h"
@@ skipping 13 matching lines @@
 
 class SystemTray;
 class SystemTrayItem;
 
 namespace internal {
 
 class SystemTrayBubble;
 
 class SystemTrayBubbleView : public views::BubbleDelegateView {
  public:
+  class Host {
+   public:
+    Host() {}
+    virtual ~Host() {}
+
+    virtual void BubbleViewDestroyed() = 0;
+    virtual gfx::Rect GetAnchorRect() const = 0;
+    virtual void OnMouseEnteredView() = 0;
+    virtual void OnMouseExitedView() = 0;
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(Host);
+  };
+
   SystemTrayBubbleView(views::View* anchor,
                        views::BubbleBorder::ArrowLocation arrow_location,
-                       SystemTrayBubble* host,
-                       bool can_activate);
+                       Host* host,
+                       bool can_activate,
+                       int bubble_width);
   virtual ~SystemTrayBubbleView();
 
-  void SetBubbleBorder(views::BubbleBorder* border);
+  // Creates a bubble border with the specified arrow offset.
+  void SetBubbleBorder(int arrow_offset);
 
+  // Called wheever the bubble anchor location may have moved.

[jennyz, 2012/06/08 20:20:17]

typo: wheever->whenever

[stevenjb (google-dont-use), 2012/06/08 20:27:48]

Done.

   void UpdateAnchor();
 
+  // Sets the maximum bubble height and resizes the bubble.
+  void SetMaxHeight(int height);
+
   // Called when the host is destroyed.
   void reset_host() { host_ = NULL; }
 
- private:
-  friend class SystemTrayBubble;
+  // Overridden from views::WidgetDelegate.
+  virtual bool CanActivate() const OVERRIDE;
 
   // Overridden from views::BubbleDelegateView.
-  virtual void Init() OVERRIDE;
   virtual gfx::Rect GetAnchorRect() OVERRIDE;
-  virtual bool CanActivate() const OVERRIDE;
 
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+
+ protected:
+  // Overridden from views::BubbleDelegateView.
+  virtual void Init() OVERRIDE;
+  virtual gfx::Rect GetBubbleBounds() OVERRIDE;
+
+  // Overridden from views::View.
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
 
-  void set_max_height(int height) { max_height_ = height; }
-
-  SystemTrayBubble* host_;
+  Host* host_;
   bool can_activate_;
   int max_height_;
+  int bubble_width_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBubbleView);
 };
 
 class SystemTrayBubble : public aura::EventFilter,
-                         public views::Widget::Observer {
+                         public views::Widget::Observer,
+                         public SystemTrayBubbleView::Host {
  public:
   enum BubbleType {
     BUBBLE_TYPE_DEFAULT,
     BUBBLE_TYPE_DETAILED,
     BUBBLE_TYPE_NOTIFICATION
   };
 
   enum AnchorType {
     ANCHOR_TYPE_TRAY,
     ANCHOR_TYPE_BUBBLE
@@ skipping 16 matching lines @@
   virtual ~SystemTrayBubble();
 
   // Change the items displayed in the bubble.
   void UpdateView(const std::vector<ash::SystemTrayItem*>& items,
                   BubbleType bubble_type);
 
   // Creates |bubble_view_| and a child views for each member of |items_|.
   // Also creates |bubble_widget_| and sets up animations.
   void InitView(const InitParams& init_params);
 
-  gfx::Rect GetAnchorRect() const;
+  // Overridden from TrayBubbleView::Host.
+  virtual void BubbleViewDestroyed() OVERRIDE;
+  virtual gfx::Rect GetAnchorRect() const OVERRIDE;
+  virtual void OnMouseEnteredView() OVERRIDE;
+  virtual void OnMouseExitedView() OVERRIDE;
 
   BubbleType bubble_type() const { return bubble_type_; }
   SystemTrayBubbleView* bubble_view() const { return bubble_view_; }
 
   void DestroyItemViews();
   void StartAutoCloseTimer(int seconds);
   void StopAutoCloseTimer();
   void RestartAutoCloseTimer();
   void Close();
 
@@ skipping 28 matching lines @@
   int autoclose_delay_;
   base::OneShotTimer<SystemTrayBubble> autoclose_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_