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

Side by Side Diff: ui/views/controls/menu/menu_separator.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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "ui/base/models/menu_separator_types.h" 9 #include "ui/base/models/menu_separator_types.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 11
12 namespace views { 12 namespace views {
13 13
14 class MenuItemView; 14 class MenuItemView;
15 15
16 class MenuSeparator : public View { 16 class MenuSeparator : public View {
17 public: 17 public:
18 MenuSeparator(MenuItemView* parent, ui::MenuSeparatorType type) 18 MenuSeparator(MenuItemView* parent, ui::MenuSeparatorType type)
19 : type_(type), 19 : type_(type),
20 parent_menu_item_(parent) {} 20 parent_menu_item_(parent) {}
21 21
22 // View overrides. 22 // View overrides.
23 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 23 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
24 virtual gfx::Size GetPreferredSize() OVERRIDE; 24 virtual gfx::Size GetPreferredSize() const OVERRIDE;
25 25
26 private: 26 private:
27 void OnPaintAura(gfx::Canvas* canvas); 27 void OnPaintAura(gfx::Canvas* canvas);
28 gfx::Size GetPreferredSizeAura(); 28 gfx::Size GetPreferredSizeAura() const;
29 29
30 // The type of the separator. 30 // The type of the separator.
31 const ui::MenuSeparatorType type_; 31 const ui::MenuSeparatorType type_;
32 32
33 // Our parent. 33 // Our parent.
34 MenuItemView* parent_menu_item_; 34 MenuItemView* parent_menu_item_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(MenuSeparator); 36 DISALLOW_COPY_AND_ASSIGN(MenuSeparator);
37 }; 37 };
38 38
39 } // namespace views 39 } // namespace views
40 40
41 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_ 41 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_scroll_view_container.cc ('k') | ui/views/controls/menu/menu_separator_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698