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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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/throbber_view.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 21 matching lines...) Expand all
32 class TrayContainer : public views::View { 32 class TrayContainer : public views::View {
33 public: 33 public:
34 explicit TrayContainer(ShelfAlignment alignment); 34 explicit TrayContainer(ShelfAlignment alignment);
35 virtual ~TrayContainer() {} 35 virtual ~TrayContainer() {}
36 36
37 void SetAlignment(ShelfAlignment alignment); 37 void SetAlignment(ShelfAlignment alignment);
38 38
39 void set_size(const gfx::Size& size) { size_ = size; } 39 void set_size(const gfx::Size& size) { size_ = size; }
40 40
41 // Overridden from views::View. 41 // Overridden from views::View.
42 virtual gfx::Size GetPreferredSize() OVERRIDE; 42 virtual gfx::Size GetPreferredSize() const OVERRIDE;
43 43
44 protected: 44 protected:
45 // Overridden from views::View. 45 // Overridden from views::View.
46 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 46 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
47 virtual void ChildVisibilityChanged(View* child) OVERRIDE; 47 virtual void ChildVisibilityChanged(View* child) OVERRIDE;
48 virtual void ViewHierarchyChanged( 48 virtual void ViewHierarchyChanged(
49 const ViewHierarchyChangedDetails& details) OVERRIDE; 49 const ViewHierarchyChangedDetails& details) OVERRIDE;
50 50
51 private: 51 private:
52 void UpdateLayout(); 52 void UpdateLayout();
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 scoped_ptr<TrayWidgetObserver> widget_observer_; 178 scoped_ptr<TrayWidgetObserver> widget_observer_;
179 scoped_ptr<TrayEventFilter> tray_event_filter_; 179 scoped_ptr<TrayEventFilter> tray_event_filter_;
180 180
181 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 181 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
182 }; 182 };
183 183
184 } // namespace ash 184 } // namespace ash
185 185
186 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 186 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/throbber_view.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698