| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 // Creates and sets contents background to |background_|. | 90 // Creates and sets contents background to |background_|. |
| 91 void SetContentsBackground(); | 91 void SetContentsBackground(); |
| 92 | 92 |
| 93 // Sets whether the tray paints a background. Default is true, but is set to | 93 // Sets whether the tray paints a background. Default is true, but is set to |
| 94 // false if a window overlaps the shelf. | 94 // false if a window overlaps the shelf. |
| 95 void SetPaintsBackground( | 95 void SetPaintsBackground( |
| 96 bool value, | 96 bool value, |
| 97 internal::BackgroundAnimator::ChangeType change_type); | 97 internal::BackgroundAnimator::ChangeType change_type); |
| 98 | 98 |
| 99 // Convenience function to call same function in status_area_widget_. | |
| 100 void UpdateShouldShowLauncher(); | |
| 101 | |
| 102 StatusAreaWidget* status_area_widget() { | 99 StatusAreaWidget* status_area_widget() { |
| 103 return status_area_widget_; | 100 return status_area_widget_; |
| 104 } | 101 } |
| 105 TrayContainer* tray_container() const { return tray_container_; } | 102 TrayContainer* tray_container() const { return tray_container_; } |
| 106 ShelfAlignment shelf_alignment() const { return shelf_alignment_; } | 103 ShelfAlignment shelf_alignment() const { return shelf_alignment_; } |
| 107 | 104 |
| 108 private: | 105 private: |
| 109 friend class TrayLayerAnimationObserver; | 106 friend class TrayLayerAnimationObserver; |
| 110 | 107 |
| 111 // Called from Initialize after all status area trays have been created. | 108 // Called from Initialize after all status area trays have been created. |
| (...skipping 17 matching lines...) Expand all Loading... |
| 129 scoped_ptr<internal::TrayLayerAnimationObserver> | 126 scoped_ptr<internal::TrayLayerAnimationObserver> |
| 130 layer_animation_observer_; | 127 layer_animation_observer_; |
| 131 | 128 |
| 132 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); | 129 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); |
| 133 }; | 130 }; |
| 134 | 131 |
| 135 } // namespace internal | 132 } // namespace internal |
| 136 } // namespace ash | 133 } // namespace ash |
| 137 | 134 |
| 138 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 135 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| OLD | NEW |