Fixes for re-enabling more MSVC level 4 warnings: ui/ edition

ui/native_theme/native_theme_win.cc

 // Copyright (c) 2012 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/native_theme/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 933 matching lines @@
                      &rect_win, NULL);
 }
 
 HRESULT NativeThemeWin::PaintMenuItemBackground(
     HDC hdc,
     State state,
     const gfx::Rect& rect,
     const MenuItemExtraParams& extra) const {
   HANDLE handle = GetThemeHandle(MENU);
   RECT rect_win = rect.ToRECT();
-  int state_id;
+  int state_id = MPI_NORMAL;
   switch (state) {
     case kDisabled:
       state_id = extra.is_selected ? MPI_DISABLEDHOT : MPI_DISABLED;
       break;
     case kHovered:
       state_id = MPI_HOT;
       break;
     case kNormal:
-      state_id = MPI_NORMAL;
       break;
     case kPressed:
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   if (handle && draw_theme_)
     return draw_theme_(handle, hdc, MENU_POPUPITEM, state_id, &rect_win, NULL);
 
   if (extra.is_selected)
     FillRect(hdc, &rect_win, GetSysColorBrush(COLOR_HIGHLIGHT));
   return S_OK;
 }
 
 HRESULT NativeThemeWin::PaintPushButton(HDC hdc,
                                         Part part,
                                         State state,
                                         const gfx::Rect& rect,
                                         const ButtonExtraParams& extra) const {
-  int state_id;
+  int state_id = extra.is_default ? PBS_DEFAULTED : PBS_NORMAL;
   switch (state) {
     case kDisabled:
       state_id = PBS_DISABLED;
       break;
     case kHovered:
       state_id = PBS_HOT;
       break;
     case kNormal:
-      state_id = extra.is_default ? PBS_DEFAULTED : PBS_NORMAL;
       break;
     case kPressed:
       state_id = PBS_PRESSED;
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   RECT rect_win = rect.ToRECT();
   return PaintButton(hdc, state, extra, BP_PUSHBUTTON, state_id, &rect_win);
 }
 
 HRESULT NativeThemeWin::PaintRadioButton(HDC hdc,
                                          Part part,
                                          State state,
                                          const gfx::Rect& rect,
                                          const ButtonExtraParams& extra) const {
-  int state_id;
+  int state_id = extra.checked ? RBS_CHECKEDNORMAL : RBS_UNCHECKEDNORMAL;
   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;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   RECT rect_win = rect.ToRECT();
   return PaintButton(hdc, state, extra, BP_RADIOBUTTON, state_id, &rect_win);
 }
 
 HRESULT NativeThemeWin::PaintCheckbox(HDC hdc,
                                       Part part,
                                       State state,
                                       const gfx::Rect& rect,
                                       const ButtonExtraParams& extra) const {
-  int state_id;
+  int state_id = extra.checked ?
+      CBS_CHECKEDNORMAL :
+      (extra.indeterminate ? CBS_MIXEDNORMAL : CBS_UNCHECKEDNORMAL);
   switch (state) {
     case kDisabled:
       state_id = extra.checked ?
           CBS_CHECKEDDISABLED :
           (extra.indeterminate ? CBS_MIXEDDISABLED : CBS_UNCHECKEDDISABLED);
       break;
     case kHovered:
       state_id = extra.checked ?
           CBS_CHECKEDHOT :
           (extra.indeterminate ? CBS_MIXEDHOT : CBS_UNCHECKEDHOT);
       break;
     case kNormal:
-      state_id = extra.checked ?
-          CBS_CHECKEDNORMAL :
-          (extra.indeterminate ? CBS_MIXEDNORMAL : CBS_UNCHECKEDNORMAL);
       break;
     case kPressed:
       state_id = extra.checked ?
           CBS_CHECKEDPRESSED :
           (extra.indeterminate ? CBS_MIXEDPRESSED : CBS_UNCHECKEDPRESSED);
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   RECT rect_win = rect.ToRECT();
   return PaintButton(hdc, state, extra, BP_CHECKBOX, state_id, &rect_win);
 }
 
 HRESULT NativeThemeWin::PaintMenuList(HDC hdc,
                                       State state,
                                       const gfx::Rect& rect,
                                       const MenuListExtraParams& extra) const {
   HANDLE handle = GetThemeHandle(MENULIST);
   RECT rect_win = rect.ToRECT();
-  int state_id;
+  int state_id = CBXS_NORMAL;
   switch (state) {
     case kDisabled:
       state_id = CBXS_DISABLED;
       break;
     case kHovered:
       state_id = CBXS_HOT;
       break;
     case kNormal:
-      state_id = CBXS_NORMAL;
       break;
     case kPressed:
       state_id = CBXS_PRESSED;
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   if (handle && draw_theme_)
@@ skipping 47 matching lines @@
           NOTREACHED();
           break;
       }
     }
     return PaintScaledTheme(handle, hdc, SBP_ARROWBTN, state_id, rect);
   }
 
   int classic_state = DFCS_SCROLLDOWN;
   switch (part) {
     case kScrollbarDownArrow:
-      classic_state = DFCS_SCROLLDOWN;
       break;
     case kScrollbarLeftArrow:
       classic_state = DFCS_SCROLLLEFT;
       break;
     case kScrollbarRightArrow:
       classic_state = DFCS_SCROLLRIGHT;
       break;
     case kScrollbarUpArrow:
       classic_state = DFCS_SCROLLUP;
       break;
@@ skipping 23 matching lines @@
 
 HRESULT NativeThemeWin::PaintScrollbarThumb(
     HDC hdc,
     Part part,
     State state,
     const gfx::Rect& rect,
     const ScrollbarThumbExtraParams& extra) const {
   HANDLE handle = GetThemeHandle(SCROLLBAR);
   RECT rect_win = rect.ToRECT();
 
-  int part_id;
+  int part_id = SBP_THUMBBTNVERT;
   switch (part) {
-    case NativeTheme::kScrollbarHorizontalThumb:
+    case kScrollbarHorizontalThumb:
       part_id = SBP_THUMBBTNHORZ;
       break;
-    case NativeTheme::kScrollbarVerticalThumb:
-      part_id = SBP_THUMBBTNVERT;
+    case kScrollbarVerticalThumb:
       break;
-    case NativeTheme::kScrollbarHorizontalGripper:
+    case kScrollbarHorizontalGripper:
       part_id = SBP_GRIPPERHORZ;
       break;
-    case NativeTheme::kScrollbarVerticalGripper:
+    case kScrollbarVerticalGripper:
       part_id = SBP_GRIPPERVERT;
       break;
     default:
       NOTREACHED();
       break;
   }
 
-  int state_id;
+  int state_id = SCRBS_NORMAL;
   switch (state) {
     case kDisabled:
       state_id = SCRBS_DISABLED;
       break;
     case kHovered:
       state_id = extra.is_hovering ? SCRBS_HOVER : SCRBS_HOT;
       break;
     case kNormal:
-      state_id = SCRBS_NORMAL;
       break;
     case kPressed:
       state_id = SCRBS_PRESSED;
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   if (handle && draw_theme_)
     return PaintScaledTheme(handle, hdc, part_id, state_id, rect);
 
   // Draw it manually.
   if ((part_id == SBP_THUMBBTNHORZ) || (part_id == SBP_THUMBBTNVERT))
     DrawEdge(hdc, &rect_win, EDGE_RAISED, BF_RECT | BF_MIDDLE);
   // Classic mode doesn't have a gripper.
   return S_OK;
 }
 
 HRESULT NativeThemeWin::PaintScrollbarTrack(
     SkCanvas* canvas,
     HDC hdc,
     Part part,
     State state,
     const gfx::Rect& rect,
     const ScrollbarTrackExtraParams& extra) const {
   HANDLE handle = GetThemeHandle(SCROLLBAR);
   RECT rect_win = rect.ToRECT();
 
-  int part_id;
-  switch (part) {
-    case NativeTheme::kScrollbarHorizontalTrack:
-      part_id = extra.is_upper ? SBP_UPPERTRACKHORZ : SBP_LOWERTRACKHORZ;
-      break;
-    case NativeTheme::kScrollbarVerticalTrack:
-      part_id = extra.is_upper ? SBP_UPPERTRACKVERT : SBP_LOWERTRACKVERT;
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
+  const int part_id = extra.is_upper ?

[sky, 2014/07/11 19:09:17]

When I come across code with nested ternary operators99% of the time I know it's
written by you;)

[Peter Kasting, 2014/07/11 19:19:55]

As I said in the previous patch, I don't normally prefer these -- I only did it
here for consistency with the other two similar places in this file that already
use these.

The alternative was to do this:

  int part_id = extra.is_upper ? SBP_UPPERTRACKVERT : SBP_LOWERTRACKVERT;
  switch (part) {
    case kScrollbarHorizontalTrack:
      part_id = extra.is_upper ? SBP_UPPERTRACKHORZ : SBP_LOWERTRACKHORZ;
      break;
    case kScrollbarVerticalTrack:
      break;
    default:
      NOTREACHED();
      break;
  }

...which didn't seem sufficiently better to warrant doing this + changing the
other nested ternaries.

Seriously, I stopped preferring nested ternaries about 7 years ago :)

+      ((part == kScrollbarHorizontalTrack) ?
+          SBP_UPPERTRACKHORZ : SBP_UPPERTRACKVERT) :
+      ((part == kScrollbarHorizontalTrack) ?
+          SBP_LOWERTRACKHORZ : SBP_LOWERTRACKVERT);
 
-  int state_id;
+  int state_id = SCRBS_NORMAL;
   switch (state) {
     case kDisabled:
       state_id = SCRBS_DISABLED;
       break;
     case kHovered:
       state_id = SCRBS_HOVER;
       break;
     case kNormal:
-      state_id = SCRBS_NORMAL;
       break;
     case kPressed:
       state_id = SCRBS_PRESSED;
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   if (handle && draw_theme_)
@@ skipping 17 matching lines @@
 
 HRESULT NativeThemeWin::PaintSpinButton(
     HDC hdc,
     Part part,
     State state,
     const gfx::Rect& rect,
     const InnerSpinButtonExtraParams& extra) const {
   HANDLE handle = GetThemeHandle(SPIN);
   RECT rect_win = rect.ToRECT();
   int part_id = extra.spin_up ? SPNP_UP : SPNP_DOWN;
-  int state_id;
+  int state_id = extra.spin_up ? UPS_NORMAL : DNS_NORMAL;
   switch (state) {
     case kDisabled:
       state_id = extra.spin_up ? UPS_DISABLED : DNS_DISABLED;
       break;
     case kHovered:
       state_id = extra.spin_up ? UPS_HOT : DNS_HOT;
       break;
     case kNormal:
-      state_id = extra.spin_up ? UPS_NORMAL : DNS_NORMAL;
       break;
     case kPressed:
       state_id = extra.spin_up ? UPS_PRESSED : DNS_PRESSED;
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   if (handle && draw_theme_)
     return draw_theme_(handle, hdc, part_id, state_id, &rect_win, NULL);
   DrawFrameControl(hdc, &rect_win, DFC_SCROLL, extra.classic_state);
   return S_OK;
 }
 
 HRESULT NativeThemeWin::PaintTrackbar(
     SkCanvas* canvas,
     HDC hdc,
     Part part,
     State state,
     const gfx::Rect& rect,
     const TrackbarExtraParams& extra) const {
   const int part_id = extra.vertical ?
       ((part == kTrackbarTrack) ? TKP_TRACKVERT : TKP_THUMBVERT) :
       ((part == kTrackbarTrack) ? TKP_TRACK : TKP_THUMBBOTTOM);
 
-  int state_id = 0;
+  int state_id = TUS_NORMAL;
   switch (state) {
     case kDisabled:
       state_id = TUS_DISABLED;
       break;
     case kHovered:
       state_id = TUS_HOT;
       break;
     case kNormal:
-      state_id = TUS_NORMAL;
       break;
     case kPressed:
       state_id = TUS_PRESSED;
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   // Make the channel be 4 px thick in the center of the supplied rect.  (4 px
@@ skipping 200 matching lines @@
       state_id = ETS_DISABLED;
       break;
     case kHovered:
       state_id = ETS_HOT;
       break;
     case kNormal:
       if (extra.is_read_only)
         state_id = ETS_READONLY;
       else if (extra.is_focused)
         state_id = ETS_FOCUSED;
-      else
-        state_id = ETS_NORMAL;
       break;
     case kPressed:
       state_id = ETS_SELECTED;
       break;
     case kNumStates:
       NOTREACHED();
       break;
   }
 
   RECT rect_win = rect.ToRECT();
@@ skipping 403 matching lines @@
 
   base::win::ScopedCreateDC bitmap_dc(CreateCompatibleDC(NULL));
   base::win::ScopedSelectObject select_bitmap(bitmap_dc, mask_bitmap);
   RECT local_rect = { 0, 0, width, height };
   DrawFrameControl(bitmap_dc, &local_rect, type, state);
 
   // We're going to use BitBlt with a b&w mask. This results in using the dest
   // dc's text color for the black bits in the mask, and the dest dc's
   // background color for the white bits in the mask. DrawFrameControl draws the
   // check in black, and the background in white.
-  int bg_color_key;
-  int text_color_key;
+  int bg_color_key = COLOR_MENU;
+  int text_color_key = COLOR_MENUTEXT;
   switch (control_state) {
     case kDisabled:
       bg_color_key = is_selected ? COLOR_HIGHLIGHT : COLOR_MENU;
       text_color_key = COLOR_GRAYTEXT;
       break;
     case kHovered:
       bg_color_key = COLOR_HIGHLIGHT;
       text_color_key = COLOR_HIGHLIGHTTEXT;
       break;
     case kNormal:
-      bg_color_key = COLOR_MENU;
-      text_color_key = COLOR_MENUTEXT;
       break;
     case kPressed:
     case kNumStates:
       NOTREACHED();
-      bg_color_key = COLOR_MENU;
-      text_color_key = COLOR_MENUTEXT;
       break;
   }
   COLORREF old_bg_color = SetBkColor(hdc, GetSysColor(bg_color_key));
   COLORREF old_text_color = SetTextColor(hdc, GetSysColor(text_color_key));
   BitBlt(hdc, rect.x(), rect.y(), width, height, bitmap_dc, 0, 0, SRCCOPY);
   SetBkColor(hdc, old_bg_color);
   SetTextColor(hdc, old_text_color);
 
   return S_OK;
 }
@@ skipping 46 matching lines @@
     break;
   case LAST:
     NOTREACHED();
     break;
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace ui