More TOUCH_UI hacks and constant removal. And TODO(saintlou) cleanup.

ui/gfx/native_theme_base.cc

 // Copyright (c) 2011 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/gfx/native_theme_base.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "grit/gfx_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 
 unsigned int NativeThemeBase::button_length_ = 14;
-#if defined(TOUCH_UI)
-unsigned int NativeThemeBase::scrollbar_width_ = 0;
-#else
 unsigned int NativeThemeBase::scrollbar_width_ = 15;
-#endif
 
 // These are the default dimensions of radio buttons and checkboxes.
 static const int kCheckboxAndRadioWidth = 13;
 static const int kCheckboxAndRadioHeight = 13;
 
 // These sizes match the sizes in Chromium Win.
 static const int kSliderThumbWidth = 11;
 static const int kSliderThumbHeight = 21;
 
 static const SkColor kSliderTrackBackgroundColor =
@@ skipping 950 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2f, diff);
 }
 
 }  // namespace gfx