Wires up drag and drop for bookmark menus and cleans up a couple of...

views/controls/menu/menu_scroll_view_container.cc

 // Copyright (c) 2009 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 "views/controls/menu/menu_scroll_view_container.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
@@ skipping 61 matching lines @@
   virtual void OnDragExited() {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     host_->GetMenuItem()->GetMenuController()->OnDragExitedScrollButton(host_);
   }
 
   virtual int OnPerformDrop(const DropTargetEvent& event) {
     return DragDropTypes::DRAG_NONE;
   }
 
   virtual void Paint(gfx::Canvas* canvas) {
+    const MenuConfig& config = MenuConfig::instance();
+
 #if defined(OS_WIN)
-    const MenuConfig& config = MenuConfig::instance();
     HDC dc = canvas->beginPlatformPaint();
 
     // The background.
     RECT item_bounds = { 0, 0, width(), height() };
     NativeTheme::instance()->PaintMenuItemBackground(
         NativeTheme::MENU, dc, MENU_POPUPITEM, MPI_NORMAL, false,
         &item_bounds);
+    canvas->endPlatformPaint();
+
+    SkColor arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);
+#else
+    SkColor arrow_color = SK_ColorBLACK;
+#endif
 
     // Then the arrow.
     int x = width() / 2;
     int y = (height() - config.scroll_arrow_height) / 2;
     int delta_y = 1;
     if (!is_up_) {
       delta_y = -1;
       y += config.scroll_arrow_height;
     }
-    SkColor arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);
     for (int i = 0; i < config.scroll_arrow_height; ++i, --x, y += delta_y)
       canvas->FillRectInt(arrow_color, x, y, (i * 2) + 1, 1);
-
-    canvas->endPlatformPaint();
-#else
-    NOTIMPLEMENTED();
-#endif
   }
 
  private:
   // SubmenuView we were created for.
   SubmenuView* host_;
 
   // Direction of the button.
   bool is_up_;
 
   // Preferred height.
@@ skipping 107 matching lines @@
 }
 
 gfx::Size MenuScrollViewContainer::GetPreferredSize() {
   gfx::Size prefsize = scroll_view_->GetContents()->GetPreferredSize();
   gfx::Insets insets = GetInsets();
   prefsize.Enlarge(insets.width(), insets.height());
   return prefsize;
 }
 
 }  // namespace views