| 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_TRAY_TRAY_BACKGROUND_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/shelf/background_animator.h" | 9 #include "ash/shelf/background_animator.h" |
| 10 #include "ash/shelf/shelf_types.h" | 10 #include "ash/shelf/shelf_types.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 ShelfLayoutManager* GetShelfLayoutManager(); | 145 ShelfLayoutManager* GetShelfLayoutManager(); |
| 146 | 146 |
| 147 // Updates the arrow visibility based on the launcher visibility. | 147 // Updates the arrow visibility based on the launcher visibility. |
| 148 void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view); | 148 void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view); |
| 149 | 149 |
| 150 private: | 150 private: |
| 151 class TrayWidgetObserver; | 151 class TrayWidgetObserver; |
| 152 | 152 |
| 153 // Called from Initialize after all status area trays have been created. | 153 // Called from Initialize after all status area trays have been created. |
| 154 // Sets the border based on the position of the view. | 154 // Sets the border based on the position of the view. |
| 155 void SetBorder(); | 155 void SetTrayBorder(); |
| 156 | 156 |
| 157 // Unowned pointer to parent widget. | 157 // Unowned pointer to parent widget. |
| 158 StatusAreaWidget* status_area_widget_; | 158 StatusAreaWidget* status_area_widget_; |
| 159 | 159 |
| 160 // Convenience pointer to the contents view. | 160 // Convenience pointer to the contents view. |
| 161 TrayContainer* tray_container_; | 161 TrayContainer* tray_container_; |
| 162 | 162 |
| 163 // Shelf alignment. | 163 // Shelf alignment. |
| 164 ShelfAlignment shelf_alignment_; | 164 ShelfAlignment shelf_alignment_; |
| 165 | 165 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 180 scoped_ptr<TrayWidgetObserver> widget_observer_; | 180 scoped_ptr<TrayWidgetObserver> widget_observer_; |
| 181 scoped_ptr<TrayEventFilter> tray_event_filter_; | 181 scoped_ptr<TrayEventFilter> tray_event_filter_; |
| 182 | 182 |
| 183 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); | 183 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); |
| 184 }; | 184 }; |
| 185 | 185 |
| 186 } // namespace internal | 186 } // namespace internal |
| 187 } // namespace ash | 187 } // namespace ash |
| 188 | 188 |
| 189 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 189 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| OLD | NEW |