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

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

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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_unittest.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_bubble_view.h" 10 #include "ash/system/tray/tray_bubble_view.h"
11 #include "ash/system/tray/tray_views.h" 11 #include "ash/system/tray/tray_views.h"
12 #include "ash/wm/shelf_types.h" 12 #include "ash/wm/shelf_types.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace internal { 15 namespace internal {
16 16
17 class ShelfLayoutManager;
17 class StatusAreaWidget; 18 class StatusAreaWidget;
18 class TrayBackground; 19 class TrayBackground;
19 class TrayLayerAnimationObserver; 20 class TrayLayerAnimationObserver;
20 21
21 // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray. 22 // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray.
22 // This class handles setting and animating the background when the Launcher 23 // This class handles setting and animating the background when the Launcher
23 // his shown/hidden. It also inherits from ActionableView so that the tray 24 // his shown/hidden. It also inherits from ActionableView so that the tray
24 // items can override PerformAction when clicked on. 25 // items can override PerformAction when clicked on.
25 26
26 class ASH_EXPORT TrayBackgroundView : public internal::ActionableView, 27 class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 124
124 StatusAreaWidget* status_area_widget() { 125 StatusAreaWidget* status_area_widget() {
125 return status_area_widget_; 126 return status_area_widget_;
126 } 127 }
127 const StatusAreaWidget* status_area_widget() const { 128 const StatusAreaWidget* status_area_widget() const {
128 return status_area_widget_; 129 return status_area_widget_;
129 } 130 }
130 TrayContainer* tray_container() const { return tray_container_; } 131 TrayContainer* tray_container() const { return tray_container_; }
131 ShelfAlignment shelf_alignment() const { return shelf_alignment_; } 132 ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
132 133
134 ShelfLayoutManager* GetShelfLayoutManager();
135
133 private: 136 private:
134 friend class TrayLayerAnimationObserver; 137 friend class TrayLayerAnimationObserver;
135 138
136 // Called from Initialize after all status area trays have been created. 139 // Called from Initialize after all status area trays have been created.
137 // Sets the border based on the position of the view. 140 // Sets the border based on the position of the view.
138 void SetBorder(); 141 void SetBorder();
139 142
140 // Unowned pointer to parent widget. 143 // Unowned pointer to parent widget.
141 StatusAreaWidget* status_area_widget_; 144 StatusAreaWidget* status_area_widget_;
142 145
(...skipping 11 matching lines...) Expand all
154 scoped_ptr<internal::TrayLayerAnimationObserver> 157 scoped_ptr<internal::TrayLayerAnimationObserver>
155 layer_animation_observer_; 158 layer_animation_observer_;
156 159
157 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 160 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
158 }; 161 };
159 162
160 } // namespace internal 163 } // namespace internal
161 } // namespace ash 164 } // namespace ash
162 165
163 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 166 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698