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

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: Rebase to 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
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 23 matching lines...) Expand all
34 class TrayContainer : public views::View { 34 class TrayContainer : public views::View {
35 public: 35 public:
36 explicit TrayContainer(ShelfAlignment alignment); 36 explicit TrayContainer(ShelfAlignment alignment);
37 virtual ~TrayContainer() {} 37 virtual ~TrayContainer() {}
38 38
39 void SetAlignment(ShelfAlignment alignment); 39 void SetAlignment(ShelfAlignment alignment);
40 40
41 void set_size(const gfx::Size& size) { size_ = size; } 41 void set_size(const gfx::Size& size) { size_ = size; }
42 42
43 // views::View: 43 // views::View:
44 virtual gfx::Size GetPreferredSize() OVERRIDE; 44 virtual gfx::Size GetPreferredSize() const OVERRIDE;
45 45
46 protected: 46 protected:
47 // views::View: 47 // views::View:
48 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 48 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
49 virtual void ChildVisibilityChanged(View* child) OVERRIDE; 49 virtual void ChildVisibilityChanged(View* child) OVERRIDE;
50 virtual void ViewHierarchyChanged( 50 virtual void ViewHierarchyChanged(
51 const ViewHierarchyChangedDetails& details) OVERRIDE; 51 const ViewHierarchyChangedDetails& details) OVERRIDE;
52 52
53 private: 53 private:
54 void UpdateLayout(); 54 void UpdateLayout();
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 187
188 scoped_ptr<TrayWidgetObserver> widget_observer_; 188 scoped_ptr<TrayWidgetObserver> widget_observer_;
189 scoped_ptr<TrayEventFilter> tray_event_filter_; 189 scoped_ptr<TrayEventFilter> tray_event_filter_;
190 190
191 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 191 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
192 }; 192 };
193 193
194 } // namespace ash 194 } // namespace ash
195 195
196 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 196 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698