Refactor menu controller to isolate aura dependency.

ui/views/controls/menu/menu_scroll_view_container.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_scroll_view_container.h"
 
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
@@ skipping 263 matching lines @@
   arrow_ = BubbleBorder::NONE;
   bubble_border_ = NULL;
 
   const MenuConfig& menu_config =
       content_view_->GetMenuItem()->GetMenuConfig();
 
   bool use_border = true;
   int padding = menu_config.corner_radius > 0 ?
         kBorderPaddingDueToRoundedCorners : 0;
 
-#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(USE_AURA) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
   if (menu_config.native_theme == ui::NativeThemeAura::instance()) {

[tapted, 2014/05/02 00:22:57]

This could maybe be something like

virtual int NativeTheme::MenuBorderPadding(bool* use_border) = 0;

but tweaking this #ifdef is probably fine for a first pass.

     // In case of NativeThemeAura the border gets drawn with the shadow.
     // Furthermore no additional padding is wanted.
     use_border = false;
     padding = 0;
   }
 #endif
 
   int top = menu_config.menu_vertical_border_size + padding;
   int left = menu_config.menu_horizontal_border_size + padding;
   int bottom = menu_config.menu_vertical_border_size + padding;
@@ skipping 30 matching lines @@
     case views::MenuItemView::BUBBLE_ABOVE:
       return BubbleBorder::BOTTOM_CENTER;
     case views::MenuItemView::BUBBLE_BELOW:
       return BubbleBorder::TOP_CENTER;
     default:
       return BubbleBorder::NONE;
   }
 }
 
 }  // namespace views