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

ui/gfx/native_theme_chromeos.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_chromeos.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "grit/gfx_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
@@ skipping 238 matching lines @@
 
 NativeThemeChromeos::~NativeThemeChromeos() {
 }
 
 gfx::Size NativeThemeChromeos::GetPartSize(Part part,
                                            State state,
                                            const ExtraParams& extra) const {
   // This function might be called from Worker process during html layout
   // without calling GfxModule::SetResourceProvider. So using dimension
   // constants instead of getting it from resource images.
-#if defined(TOUCH_UI)
-  static const int kScrollbarWidth = 0;
-#else
   static const int kScrollbarWidth = 13;
-#endif
   static const int kScrollbarArrowUpHeight = 12;
   static const int kScrollbarArrowDownHeight = 12;
 
   int width = 0, height = 0;
   switch (part) {
     case kScrollbarUpArrow:
       width = kScrollbarWidth;
       height = kScrollbarArrowUpHeight;
       break;
     case kScrollbarDownArrow:
@@ skipping 483 matching lines @@
 
   if (stroke_border) {
     SkPaint stroke_paint;
     GetStrokePaint(state, &stroke_paint);
     canvas->drawPath(border, stroke_paint);
   }
 }
 
 }  // namespace gfx