Make all views platforms use 'new' (cros-style) wrench menu.

ui/views/controls/menu/menu_separator_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_separator.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
 namespace {
 
 const int kSeparatorHeight = 1;
 
 }  // namespace
 
 namespace views {
 
 #if !defined(OS_WIN)
 void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
   OnPaintAura(canvas);
 }
+#endif
 
 gfx::Size MenuSeparator::GetPreferredSize() const {
-  return GetPreferredSizeAura();
-}
-#endif
-
-void MenuSeparator::OnPaintAura(gfx::Canvas* canvas) {
-  int pos = 0;
-  switch (type_) {
-    case ui::LOWER_SEPARATOR:
-      pos = height() - kSeparatorHeight;
-      break;
-    case ui::SPACING_SEPARATOR:
-      return;
-    case ui::UPPER_SEPARATOR:
-      break;
-    default:
-      pos = height() / 2;
-      break;
-  }
-  canvas->FillRect(gfx::Rect(0, pos, width(), kSeparatorHeight),
-                   GetNativeTheme()->GetSystemColor(
-                       ui::NativeTheme::kColorId_MenuSeparatorColor));
-}
-
-gfx::Size MenuSeparator::GetPreferredSizeAura() const {
   const MenuConfig& menu_config = parent_menu_item_->GetMenuConfig();
   int height = menu_config.separator_height;
   switch(type_) {
     case ui::SPACING_SEPARATOR:
       height = menu_config.separator_spacing_height;
       break;
     case ui::LOWER_SEPARATOR:
       height = menu_config.separator_lower_height;
       break;
     case ui::UPPER_SEPARATOR:
       height = menu_config.separator_upper_height;
       break;
     default:
       height = menu_config.separator_height;
       break;
   }
   return gfx::Size(10,  // Just in case we're the only item in a menu.
                    height);
 }
 
+gfx::Rect MenuSeparator::GetPaintBounds() {
+  int pos = 0;
+  switch (type_) {
+    case ui::LOWER_SEPARATOR:
+      pos = height() - kSeparatorHeight;
+      break;
+    case ui::SPACING_SEPARATOR:
+      return gfx::Rect();
+    case ui::UPPER_SEPARATOR:
+      break;
+    default:
+      pos = height() / 2;
+      break;
+  }
+
+  return gfx::Rect(0, pos, width(), kSeparatorHeight);
+}
+
+void MenuSeparator::OnPaintAura(gfx::Canvas* canvas) {
+  canvas->FillRect(GetPaintBounds(),
+                   GetNativeTheme()->GetSystemColor(
+                       ui::NativeTheme::kColorId_MenuSeparatorColor));
+}
+
 }  // namespace views