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

Side by Side Diff: ui/views/controls/menu/menu_separator.h

Issue 11088037: Revert 160886 - Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuCo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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;
15
16 class MenuSeparator : public View { 14 class MenuSeparator : public View {
17 public: 15 public:
18 MenuSeparator(MenuItemView* parent, ui::MenuSeparatorType type) 16 explicit MenuSeparator(ui::MenuSeparatorType type) : type_(type) {}
19 : type_(type),
20 parent_menu_item_(parent) {}
21 17
22 // View overrides. 18 // View overrides.
23 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 19 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
24 virtual gfx::Size GetPreferredSize() OVERRIDE; 20 virtual gfx::Size GetPreferredSize() OVERRIDE;
25 21
26 private: 22 private:
27 // The type of the separator. 23 // The type of the separator.
28 const ui::MenuSeparatorType type_; 24 const ui::MenuSeparatorType type_;
29 25
30 // Our parent.
31 MenuItemView* parent_menu_item_;
32
33 DISALLOW_COPY_AND_ASSIGN(MenuSeparator); 26 DISALLOW_COPY_AND_ASSIGN(MenuSeparator);
34 }; 27 };
35 28
36 } // namespace views 29 } // namespace views
37 30
38 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_ 31 #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