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

Side by Side Diff: ui/views/controls/menu/menu_separator_views.cc

Issue 1499793003: Fix classes that have too many virtuals for inline constructors. Base URL: https://chromium.googlesource.com/chromium/src.git@enable-virtuals-as-complexity
Patch Set: Finish fixing the codebase that's accessible from Linux. 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) 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 #include "ui/views/controls/menu/menu_separator.h" 5 #include "ui/views/controls/menu/menu_separator.h"
6 6
7 #include "third_party/skia/include/core/SkColor.h" 7 #include "third_party/skia/include/core/SkColor.h"
8 #include "ui/gfx/canvas.h" 8 #include "ui/gfx/canvas.h"
9 #include "ui/native_theme/native_theme.h" 9 #include "ui/native_theme/native_theme.h"
10 #include "ui/views/controls/menu/menu_config.h" 10 #include "ui/views/controls/menu/menu_config.h"
11 11
12 namespace { 12 namespace {
13 13
14 const int kSeparatorHeight = 1; 14 const int kSeparatorHeight = 1;
15 15
16 } // namespace 16 } // namespace
17 17
18 namespace views { 18 namespace views {
19 19
20 MenuSeparator::MenuSeparator(ui::MenuSeparatorType type) : type_(type) {}
21
20 #if !defined(OS_WIN) 22 #if !defined(OS_WIN)
21 void MenuSeparator::OnPaint(gfx::Canvas* canvas) { 23 void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
22 OnPaintAura(canvas); 24 OnPaintAura(canvas);
23 } 25 }
24 #endif 26 #endif
25 27
26 gfx::Size MenuSeparator::GetPreferredSize() const { 28 gfx::Size MenuSeparator::GetPreferredSize() const {
27 const MenuConfig& menu_config = MenuConfig::instance(); 29 const MenuConfig& menu_config = MenuConfig::instance();
28 int height = menu_config.separator_height; 30 int height = menu_config.separator_height;
29 switch(type_) { 31 switch(type_) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 return paint_rect; 67 return paint_rect;
66 } 68 }
67 69
68 void MenuSeparator::OnPaintAura(gfx::Canvas* canvas) { 70 void MenuSeparator::OnPaintAura(gfx::Canvas* canvas) {
69 canvas->FillRect(GetPaintBounds(), 71 canvas->FillRect(GetPaintBounds(),
70 GetNativeTheme()->GetSystemColor( 72 GetNativeTheme()->GetSystemColor(
71 ui::NativeTheme::kColorId_MenuSeparatorColor)); 73 ui::NativeTheme::kColorId_MenuSeparatorColor));
72 } 74 }
73 75
74 } // namespace views 76 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698