| 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/launcher/background_animator.h" | 9 #include "ash/launcher/background_animator.h" |
| 10 #include "ash/system/tray/tray_views.h" | 10 #include "ash/system/tray/tray_views.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 bool value, | 81 bool value, |
| 82 internal::BackgroundAnimator::ChangeType change_type); | 82 internal::BackgroundAnimator::ChangeType change_type); |
| 83 | 83 |
| 84 StatusAreaWidget* status_area_widget() { | 84 StatusAreaWidget* status_area_widget() { |
| 85 return status_area_widget_; | 85 return status_area_widget_; |
| 86 } | 86 } |
| 87 TrayContainer* tray_container() const { return tray_container_; } | 87 TrayContainer* tray_container() const { return tray_container_; } |
| 88 ShelfAlignment shelf_alignment() const { return shelf_alignment_; } | 88 ShelfAlignment shelf_alignment() const { return shelf_alignment_; } |
| 89 | 89 |
| 90 private: | 90 private: |
| 91 void SetBorder(); | |
| 92 | |
| 93 // Unowned pointer to parent widget. | 91 // Unowned pointer to parent widget. |
| 94 StatusAreaWidget* status_area_widget_; | 92 StatusAreaWidget* status_area_widget_; |
| 95 | 93 |
| 96 // Convenience pointer to the contents view. | 94 // Convenience pointer to the contents view. |
| 97 TrayContainer* tray_container_; | 95 TrayContainer* tray_container_; |
| 98 | 96 |
| 99 // Shelf alignment. | 97 // Shelf alignment. |
| 100 ShelfAlignment shelf_alignment_; | 98 ShelfAlignment shelf_alignment_; |
| 101 | 99 |
| 102 // Owned by the view passed to SetContents(). | 100 // Owned by the view passed to SetContents(). |
| 103 internal::TrayBackground* background_; | 101 internal::TrayBackground* background_; |
| 104 | 102 |
| 105 internal::BackgroundAnimator hide_background_animator_; | 103 internal::BackgroundAnimator hide_background_animator_; |
| 106 internal::BackgroundAnimator hover_background_animator_; | 104 internal::BackgroundAnimator hover_background_animator_; |
| 107 | 105 |
| 108 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); | 106 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); |
| 109 }; | 107 }; |
| 110 | 108 |
| 111 } // namespace internal | 109 } // namespace internal |
| 112 } // namespace ash | 110 } // namespace ash |
| 113 | 111 |
| 114 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 112 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| OLD | NEW |