Add WebNotificationTray

ash/system/status_area_widget_delegate.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_STATUS_AREA_WIDGET_DELEGATE_H_
 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
 #pragma once
 
 #include "ash/ash_export.h"
+#include "ash/wm/shelf_auto_hide_behavior.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/accessible_pane_view.h"
-#include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace internal {
 
 class FocusCycler;
 
-class ASH_EXPORT StatusAreaWidgetDelegate : public views::WidgetDelegate,
-                                            public views::AccessiblePaneView {
+class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
+                                            public views::WidgetDelegate {
  public:
   StatusAreaWidgetDelegate();
   virtual ~StatusAreaWidgetDelegate();
 
   // Sets the focus cycler.
   void SetFocusCyclerForTesting(const FocusCycler* focus_cycler);
 
   // Overridden from views::AccessiblePaneView.
   virtual View* GetDefaultFocusableChild() OVERRIDE;
 
   // Overridden from views::View:
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
 
   // views::WidgetDelegate overrides:
   virtual bool CanActivate() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
 
-  void SetLayout(views::BoxLayout::Orientation orientation);
+  void AddTray(views::View* tray);
+  void UpdateLayout();
+
+  void set_alignment(ShelfAlignment alignment) { alignment_ = alignment; }

[sadrul, 2012/06/06 19:19:18]

Move these above the overridden functions

[stevenjb, 2012/06/06 23:12:15]

Done.

+
+ protected:
+  // Overridden from views::View:
+  virtual void ChildPreferredSizeChanged(View* child);

[sadrul, 2012/06/06 19:19:18]

OVERRIDE

[stevenjb, 2012/06/06 23:12:15]

Done.

 
  private:
   const FocusCycler* focus_cycler_for_testing_;
+  ShelfAlignment alignment_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_