Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: ash/system/tray/tray_background_view.h

Issue 10823350: Re-factor system tray code controlling launcher visibility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 // Sets |contents| as a child and sets its background to |background_|. 84 // Sets |contents| as a child and sets its background to |background_|.
85 void SetContents(views::View* contents); 85 void SetContents(views::View* contents);
86 86
87 // Sets whether the tray paints a background. Default is true, but is set to 87 // Sets whether the tray paints a background. Default is true, but is set to
88 // false if a window overlaps the shelf. 88 // false if a window overlaps the shelf.
89 void SetPaintsBackground( 89 void SetPaintsBackground(
90 bool value, 90 bool value,
91 internal::BackgroundAnimator::ChangeType change_type); 91 internal::BackgroundAnimator::ChangeType change_type);
92 92
93 // Convenience function to call same function in status_area_widget_.
94 void UpdateShouldShowLauncher();
95
93 StatusAreaWidget* status_area_widget() { 96 StatusAreaWidget* status_area_widget() {
94 return status_area_widget_; 97 return status_area_widget_;
95 } 98 }
96 TrayContainer* tray_container() const { return tray_container_; } 99 TrayContainer* tray_container() const { return tray_container_; }
97 ShelfAlignment shelf_alignment() const { return shelf_alignment_; } 100 ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
98 101
99 private: 102 private:
100 friend class TrayLayerAnimationObserver; 103 friend class TrayLayerAnimationObserver;
101 104
102 // Called from Initialize after all status area trays have been created. 105 // Called from Initialize after all status area trays have been created.
(...skipping 17 matching lines...) Expand all
120 scoped_ptr<internal::TrayLayerAnimationObserver> 123 scoped_ptr<internal::TrayLayerAnimationObserver>
121 layer_animation_observer_; 124 layer_animation_observer_;
122 125
123 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 126 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
124 }; 127 };
125 128
126 } // namespace internal 129 } // namespace internal
127 } // namespace ash 130 } // namespace ash
128 131
129 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 132 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698