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

Side by Side Diff: ash/frame/custom_frame_view_ash.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_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 5 #ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 virtual gfx::Rect GetWindowBoundsForClientBounds( 46 virtual gfx::Rect GetWindowBoundsForClientBounds(
47 const gfx::Rect& client_bounds) const OVERRIDE; 47 const gfx::Rect& client_bounds) const OVERRIDE;
48 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 48 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
49 virtual void GetWindowMask(const gfx::Size& size, 49 virtual void GetWindowMask(const gfx::Size& size,
50 gfx::Path* window_mask) OVERRIDE; 50 gfx::Path* window_mask) OVERRIDE;
51 virtual void ResetWindowControls() OVERRIDE; 51 virtual void ResetWindowControls() OVERRIDE;
52 virtual void UpdateWindowIcon() OVERRIDE; 52 virtual void UpdateWindowIcon() OVERRIDE;
53 virtual void UpdateWindowTitle() OVERRIDE; 53 virtual void UpdateWindowTitle() OVERRIDE;
54 54
55 // views::View overrides: 55 // views::View overrides:
56 virtual gfx::Size GetPreferredSize() OVERRIDE; 56 virtual gfx::Size GetPreferredSize() const OVERRIDE;
57 virtual const char* GetClassName() const OVERRIDE; 57 virtual const char* GetClassName() const OVERRIDE;
58 virtual gfx::Size GetMinimumSize() OVERRIDE; 58 virtual gfx::Size GetMinimumSize() OVERRIDE;
sky 2014/05/13 16:06:08 const
59 virtual gfx::Size GetMaximumSize() OVERRIDE; 59 virtual gfx::Size GetMaximumSize() OVERRIDE;
60 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE; 60 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE;
61 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE; 61 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
62 virtual void VisibilityChanged(views::View* starting_from, 62 virtual void VisibilityChanged(views::View* starting_from,
63 bool is_visible) OVERRIDE; 63 bool is_visible) OVERRIDE;
64 64
65 // Get the view of the header. 65 // Get the view of the header.
66 views::View* GetHeaderView(); 66 views::View* GetHeaderView();
67 67
68 const views::View* GetAvatarIconViewForTest() const; 68 const views::View* GetAvatarIconViewForTest() const;
(...skipping 18 matching lines...) Expand all
87 87
88 // Updates the hittest bounds overrides based on the window state type. 88 // Updates the hittest bounds overrides based on the window state type.
89 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 89 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 91 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
92 }; 92 };
93 93
94 } // namespace ash 94 } // namespace ash
95 95
96 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 96 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698