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

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

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 11 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/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
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
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_
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