Fix checkbox in windows uninstaller.

ui/gfx/native_theme_win.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_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 108 matching lines @@
                                       const ExtraParams& extra) const {
   SIZE size;
   int part_id = GetWindowsPart(part, state, extra);
   int state_id = GetWindowsState(part, state, extra);
 
   HDC hdc = GetDC(NULL);
   HRESULT hr = GetThemePartSize(GetThemeName(part), hdc, part_id, state_id,
                                 NULL, TS_TRUE, &size);
   ReleaseDC(NULL, hdc);
 
-  return SUCCEEDED(hr) ? Size(size.cx, size.cy) : Size();
+  if (FAILED(hr)) {
+    // TODO(rogerta): For now, we need to support radio buttons and checkboxes
+    // when theming is not enabled.  Support for other parts can be added
+    // if/when needed.
+    switch (part) {
+      case kCheckbox:
+      case kRadio:
+        // TODO(rogerta): I was not able to find any API to get the default
+        // size of these controls, so determined these values empirically.
+        size.cx = 13;
+        size.cy = 13;
+        break;
+      default:
+        size.cx = 0;
+        size.cy = 0;
+        break;
+    }
+  }
+
+  return Size(size.cx, size.cy);
 }
 
 void NativeThemeWin::PaintToNonPlatformCanvas(SkCanvas* canvas,
                                               Part part,
                                               State state,
                                               const gfx::Rect& rect,
                                               const ExtraParams& extra) const {
   // TODO(asvitkine): This path is pretty inefficient - for each paint operation
   //                  it creates a new offscreen bitmap Skia canvas. This can
   //                  be sped up by doing it only once per part/state and
@@ skipping 350 matching lines @@
       break;
     case kPressed:
       state_id = PBS_PRESSED;
       break;
     default:
       NOTREACHED() << "Invalid state: " << state;
       break;
   }
 
   RECT rect_win = rect.ToRECT();
-  return PaintButton(hdc, BP_PUSHBUTTON, state_id, extra.classic_state,
-                     &rect_win);
+  return PaintButton(hdc, state, BP_PUSHBUTTON, state_id,
+                     extra.classic_state | DFCS_BUTTONPUSH, &rect_win);
 }
 
 HRESULT NativeThemeWin::PaintRadioButton(HDC hdc,
                                          Part part,
                                          State state,
                                          const gfx::Rect& rect,
                                          const ButtonExtraParams& extra) const {
   int state_id;
   switch(state) {
     case kDisabled:
       state_id = extra.checked ? RBS_CHECKEDDISABLED : RBS_UNCHECKEDDISABLED;
       break;
     case kHovered:
       state_id = extra.checked ? RBS_CHECKEDHOT : RBS_UNCHECKEDHOT;
       break;
     case kNormal:
       state_id = extra.checked ? RBS_CHECKEDNORMAL : RBS_UNCHECKEDNORMAL;
       break;
     case kPressed:
       state_id = extra.checked ? RBS_CHECKEDPRESSED : RBS_UNCHECKEDPRESSED;
       break;
     default:
       NOTREACHED() << "Invalid state: " << state;
       break;
   }
 
   RECT rect_win = rect.ToRECT();
-  return PaintButton(hdc, BP_RADIOBUTTON, state_id, extra.classic_state,
-                     &rect_win);
+  return PaintButton(hdc, state, BP_RADIOBUTTON, state_id,
+                     extra.classic_state | DFCS_BUTTONRADIO, &rect_win);
 }
 
 HRESULT NativeThemeWin::PaintCheckbox(HDC hdc,
                                       Part part,
                                       State state,
                                       const gfx::Rect& rect,
                                       const ButtonExtraParams& extra) const {
   int state_id;
   switch(state) {
     case kDisabled:
@@ skipping 15 matching lines @@
       state_id = extra.checked ? CBS_CHECKEDPRESSED :
           extra.indeterminate ? CBS_MIXEDPRESSED :
               CBS_UNCHECKEDPRESSED;
       break;
     default:
       NOTREACHED() << "Invalid state: " << state;
       break;
   }
 
   RECT rect_win = rect.ToRECT();
-  return PaintButton(hdc, BP_CHECKBOX, state_id, extra.classic_state,
-                     &rect_win);
+  return PaintButton(hdc, state, BP_CHECKBOX, state_id,
+                     extra.classic_state | DFCS_BUTTONCHECK, &rect_win);
 }
 
 HRESULT NativeThemeWin::PaintButton(HDC hdc,
+                                    State state,
                                     int part_id,
                                     int state_id,
                                     int classic_state,
                                     RECT* rect) const {
   HANDLE handle = GetThemeHandle(BUTTON);
   if (handle && draw_theme_)
     return draw_theme_(handle, hdc, part_id, state_id, rect, NULL);
 
+  // Adjust classic_state based on State.
+  switch(state) {
+    case kDisabled:
+      classic_state |= DFCS_INACTIVE;
+      break;
+    case kPressed:
+      classic_state |= DFCS_PUSHED;
+      break;
+    case kNormal:
+    case kHovered:
+      break;
+    default:
+      NOTREACHED() << "Unknown state: " << state;
+      break;
+  }
+
   // Draw it manually.
   // All pressed states have both low bits set, and no other states do.
   const bool focused = ((state_id & ETS_FOCUSED) == ETS_FOCUSED);
   const bool pressed = ((state_id & PBS_PRESSED) == PBS_PRESSED);
   if ((BP_PUSHBUTTON == part_id) && (pressed || focused)) {
     // BP_PUSHBUTTON has a focus rect drawn around the outer edge, and the
     // button itself is shrunk by 1 pixel.
     HBRUSH brush = GetSysColorBrush(COLOR_3DDKSHADOW);
     if (brush) {
       FrameRect(hdc, rect, brush);
@@ skipping 1007 matching lines @@
       }
       break;
     default:
       NOTREACHED() << "Invalid part: " << part;
       break;
   }
   return state_id;
 }
 
 }  // namespace gfx