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 169 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)

[sky, 2014/03/05 15:28:34]

nit: you can remove this ifdef too.

[varkha, 2014/03/05 15:57:38]

Done.

-    // 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_) {

[sky, 2014/03/05 15:28:34]

view->GetNativeTheme() == ui::NativeThemeAura::instance() was also removed. Does
that need to be added back?

[varkha, 2014/03/05 15:57:38]

Code in
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...
is the only place where the menu gets created and with aura it only ever sets
use_new_menu when GetNativeTheme is NativeThemeAura. So this should be OK and
maybe better this way since it removes the need for NativeThemeAura in this file
(I've removed the include as well).

+      // 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?
@@ skipping 1155 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;
 }