| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ | 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ |
| 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ | 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/shelf/shelf_types.h" | 9 #include "ash/shelf/shelf_types.h" |
| 10 #include "ash/wm/gestures/shelf_gesture_handler.h" | 10 #include "ash/wm/gestures/shelf_gesture_handler.h" |
| 11 #include "ui/gfx/image/image_skia.h" | 11 #include "ui/gfx/image/image_skia.h" |
| 12 #include "ui/views/accessible_pane_view.h" | 12 #include "ui/views/accessible_pane_view.h" |
| 13 #include "ui/views/widget/widget_delegate.h" | 13 #include "ui/views/widget/widget_delegate.h" |
| 14 | 14 |
| 15 namespace ui { |
| 16 class Layer; |
| 17 class ScopedLayerAnimationSettings; |
| 18 } // namespace ui |
| 19 |
| 15 namespace ash { | 20 namespace ash { |
| 16 class FocusCycler; | 21 class FocusCycler; |
| 17 | 22 |
| 18 class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView, | 23 class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView, |
| 19 public views::WidgetDelegate { | 24 public views::WidgetDelegate { |
| 20 public: | 25 public: |
| 21 StatusAreaWidgetDelegate(); | 26 StatusAreaWidgetDelegate(); |
| 22 virtual ~StatusAreaWidgetDelegate(); | 27 virtual ~StatusAreaWidgetDelegate(); |
| 23 | 28 |
| 24 // Add a tray view to the widget (e.g. system tray, web notifications). | 29 // Add a tray view to the widget (e.g. system tray, web notifications). |
| (...skipping 22 matching lines...) Expand all Loading... |
| 47 virtual void DeleteDelegate() OVERRIDE; | 52 virtual void DeleteDelegate() OVERRIDE; |
| 48 | 53 |
| 49 protected: | 54 protected: |
| 50 // Overridden from views::View: | 55 // Overridden from views::View: |
| 51 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; | 56 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; |
| 52 virtual void ChildVisibilityChanged(views::View* child) OVERRIDE; | 57 virtual void ChildVisibilityChanged(views::View* child) OVERRIDE; |
| 53 | 58 |
| 54 private: | 59 private: |
| 55 void UpdateWidgetSize(); | 60 void UpdateWidgetSize(); |
| 56 | 61 |
| 62 ui::ScopedLayerAnimationSettings* SetupAnimationForLayer(ui::Layer* layer); |
| 63 |
| 57 const FocusCycler* focus_cycler_for_testing_; | 64 const FocusCycler* focus_cycler_for_testing_; |
| 58 ShelfAlignment alignment_; | 65 ShelfAlignment alignment_; |
| 59 | 66 |
| 60 ShelfGestureHandler gesture_handler_; | 67 ShelfGestureHandler gesture_handler_; |
| 61 | 68 |
| 62 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate); | 69 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate); |
| 63 }; | 70 }; |
| 64 | 71 |
| 65 } // namespace ash | 72 } // namespace ash |
| 66 | 73 |
| 67 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ | 74 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ |
| OLD | NEW |