Removes extra left border from wrench menu buttons

chrome/browser/ui/views/toolbar/wrench_menu.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 39 matching lines @@
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/native_theme/native_theme_aura.h"
-#endif
-
 using base::UserMetricsAction;
 using content::HostZoomMap;
 using content::WebContents;
 using ui::MenuModel;
 using views::CustomButton;
 using views::ImageButton;
 using views::Label;
 using views::LabelButton;
 using views::MenuConfig;
 using views::MenuItemView;
@@ skipping 106 matching lines @@
     }
   }
 
   // Overridden from views::Background.
   virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE {
     CustomButton* button = CustomButton::AsCustomButton(view);
     views::Button::ButtonState state =
         button ? button->state() : views::Button::STATE_NORMAL;
     int w = view->width();
     int h = view->height();
-#if defined(USE_AURA)
-    // Normal buttons get a border drawn on the right side and the rest gets
-    // filled in. The left button however does not get a line to combine
-    // buttons.
-    int border = 0;
-    if (type_ != RIGHT_BUTTON) {
-      border = 1;
-      canvas->FillRect(gfx::Rect(0, 0, border, h),
-                       BorderColor(view, views::Button::STATE_NORMAL));
-    }
     if (use_new_menu_) {
+      // Normal buttons get a border drawn on the right side and the rest gets
+      // filled in. The left button however does not get a line to combine
+      // buttons.
+      if (type_ != RIGHT_BUTTON) {
+        canvas->FillRect(gfx::Rect(0, 0, 1, h),
+                         BorderColor(view, views::Button::STATE_NORMAL));
+      }
       gfx::Rect bounds(view->GetLocalBounds());
       bounds.set_x(view->GetMirroredXForRect(bounds));
       DrawBackground(canvas, view, bounds, state);
       return;
     }
-#endif
     const SkColor border_color = BorderColor(view, state);
     switch (TypeAdjustedForRTL()) {
       // TODO(pkasting): Why don't all the following use SkPaths with rounded
       // corners?
       case LEFT_BUTTON:
         DrawBackground(canvas, view, gfx::Rect(1, 1, w, h - 2), state);
         canvas->FillRect(gfx::Rect(2, 0, w, 1), border_color);
         canvas->FillRect(gfx::Rect(1, 1, 1, 1), border_color);
         canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border_color);
         canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border_color);
@@ skipping 1149 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int WrenchMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }