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

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

Issue 1514693006: Revert of Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase revert on https://codereview.chromium.org/1504743003 Created 5 years 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
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 explicit MenuSeparator(ui::MenuSeparatorType type) : type_(type) {} 18 MenuSeparator(MenuItemView* parent, ui::MenuSeparatorType type)
19 : type_(type),
20 parent_menu_item_(parent) {}
19 21
20 // View overrides. 22 // View overrides.
21 void OnPaint(gfx::Canvas* canvas) override; 23 void OnPaint(gfx::Canvas* canvas) override;
22 gfx::Size GetPreferredSize() const override; 24 gfx::Size GetPreferredSize() const override;
23 25
24 private: 26 private:
25 // Gets the bounds where the separator should be painted. 27 // Gets the bounds where the separator should be painted.
26 gfx::Rect GetPaintBounds(); 28 gfx::Rect GetPaintBounds();
27 29
28 void OnPaintAura(gfx::Canvas* canvas); 30 void OnPaintAura(gfx::Canvas* canvas);
29 31
30 // The type of the separator. 32 // The type of the separator.
31 const ui::MenuSeparatorType type_; 33 const ui::MenuSeparatorType type_;
32 34
35 // Our parent.
36 MenuItemView* parent_menu_item_;
37
33 DISALLOW_COPY_AND_ASSIGN(MenuSeparator); 38 DISALLOW_COPY_AND_ASSIGN(MenuSeparator);
34 }; 39 };
35 40
36 } // namespace views 41 } // namespace views
37 42
38 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_ 43 #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