Remove top and bottom margins from TrayBubbleView

ui/views/bubble/tray_bubble_view.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 UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_
 #define UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_
 
+#include "base/memory/scoped_ptr.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/views_export.h"
 
 // Specialized bubble view for bubbles associated with a tray icon (e.g. the
 // Ash status area). Mostly this handles custom anchor location and arrow and
 // border rendering. This also has its own delegate for handling mouse events
 // and other implementation specific details.
 
 namespace ui {
 class LocatedEvent;
 }
 
 namespace views {
 class View;
 class Widget;
 }
 
 namespace views {
 
 namespace internal {
 class TrayBubbleBorder;
+#if defined(OS_WIN) && !defined(USE_AURA)
 class TrayBubbleBackground;
+#else
+class TrayBubbleContentMask;
+#endif
 }
 
 class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView {
  public:
   enum AnchorType {
     ANCHOR_TYPE_TRAY,
     ANCHOR_TYPE_BUBBLE
   };
 
   enum AnchorAlignment {
@@ skipping 41 matching lines @@
 
     InitParams(AnchorType anchor_type,
                AnchorAlignment anchor_alignment,
                int bubble_width);
     AnchorType anchor_type;
     AnchorAlignment anchor_alignment;
     int bubble_width;
     int max_height;
     bool can_activate;
     bool close_on_deactivate;
+#if defined(OS_WIN) && !defined(USE_AURA)
     SkColor top_color;
+#endif
     SkColor arrow_color;
     views::BubbleBorder::ArrowLocation arrow_location;
     int arrow_offset;
     views::BubbleBorder::Shadow shadow;
   };
 
   // Constructs and returns a TrayBubbleView. init_params may be modified.
   static TrayBubbleView* Create(gfx::NativeView parent_window,
                                 views::View* anchor,
                                 Delegate* delegate,
@@ skipping 53 matching lines @@
   // Overridden from views::View.
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
 
  private:
   InitParams params_;
   Delegate* delegate_;
   internal::TrayBubbleBorder* bubble_border_;
+#if defined(OS_WIN) && !defined(USE_AURA)
   internal::TrayBubbleBackground* bubble_background_;
+#else
+  scoped_ptr<internal::TrayBubbleContentMask> bubble_content_mask_;
+#endif
   bool is_gesture_dragging_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBubbleView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_