Views: Draw Textfield selected text in gray when top-level Widget loses focus.

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 <stddef.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
@@ skipping 128 matching lines @@
     return true;
   }
 
  private:
   base::win::ScopedCreateDC dc_;
   base::win::ScopedBitmap bitmap_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedCreateDCWithBitmap);
 };
 
+SkColor GetUnfocusedSelectionBackgroundColor(

[tapted, 2016/10/24 06:04:16]

Can we make this a (const) member function of NativeThemeWin?  we shouldn't have
to pass arguments then (not |system_colors should be passed by const-reference,
but that won't matter if we use a member function)

[Patti Lor, 2016/10/27 00:17:27]

Done.

+    std::map<int, SkColor> system_colors,
+    bool high_contrast) {
+  return system_colors[high_contrast ? COLOR_MENUHIGHLIGHT : COLOR_BTNFACE];
+}
+
 }  // namespace
 
 namespace ui {
 
 bool NativeThemeWin::IsThemingActive() const {
   return is_theme_active_ && is_theme_active_();
 }
 
 bool NativeThemeWin::IsUsingHighContrastTheme() const {
   if (is_using_high_contrast_valid_)
@@ skipping 397 matching lines @@
     case kColorId_TextfieldDefaultBackground:
       return system_colors_[COLOR_WINDOW];
     case kColorId_TextfieldReadOnlyColor:
       return system_colors_[COLOR_GRAYTEXT];
     case kColorId_TextfieldReadOnlyBackground:
       return system_colors_[COLOR_3DFACE];
     case kColorId_TextfieldSelectionColor:
       return system_colors_[COLOR_HIGHLIGHTTEXT];
     case kColorId_TextfieldSelectionBackgroundFocused:
       return system_colors_[COLOR_HIGHLIGHT];
+    case kColorId_TextfieldSelectionBackgroundUnfocused:
+      return GetUnfocusedSelectionBackgroundColor(system_colors_,
+                                                  IsUsingHighContrastTheme());
 
     // Tooltip
     case kColorId_TooltipBackground:
     case kColorId_TooltipText:
       NOTREACHED();
       return gfx::kPlaceholderColor;
 
     // Tree
     // NOTE: these aren't right for all themes, but as close as I could get.
     case kColorId_TreeBackground:
       return system_colors_[COLOR_WINDOW];
     case kColorId_TreeText:
       return system_colors_[COLOR_WINDOWTEXT];
     case kColorId_TreeSelectedText:
       return system_colors_[COLOR_HIGHLIGHTTEXT];
     case kColorId_TreeSelectedTextUnfocused:
       return system_colors_[COLOR_BTNTEXT];
     case kColorId_TreeSelectionBackgroundFocused:
       return system_colors_[COLOR_HIGHLIGHT];
     case kColorId_TreeSelectionBackgroundUnfocused:
-      return system_colors_[IsUsingHighContrastTheme() ?
-                              COLOR_MENUHIGHLIGHT : COLOR_BTNFACE];
+      return GetUnfocusedSelectionBackgroundColor(system_colors_,
+                                                  IsUsingHighContrastTheme());
     case kColorId_TreeArrow:
       return system_colors_[COLOR_WINDOWTEXT];
 
     // Table
     case kColorId_TableBackground:
       return system_colors_[COLOR_WINDOW];
     case kColorId_TableText:
       return system_colors_[COLOR_WINDOWTEXT];
     case kColorId_TableSelectedText:
       return system_colors_[COLOR_HIGHLIGHTTEXT];
     case kColorId_TableSelectedTextUnfocused:
       return system_colors_[COLOR_BTNTEXT];
     case kColorId_TableSelectionBackgroundFocused:
       return system_colors_[COLOR_HIGHLIGHT];
     case kColorId_TableSelectionBackgroundUnfocused:
-      return system_colors_[IsUsingHighContrastTheme() ?
-                              COLOR_MENUHIGHLIGHT : COLOR_BTNFACE];
+      return GetUnfocusedSelectionBackgroundColor(system_colors_,
+                                                  IsUsingHighContrastTheme());
     case kColorId_TableGroupingIndicatorColor:
       return system_colors_[COLOR_GRAYTEXT];
 
     // Results Tables
     case kColorId_ResultsTableNormalBackground:
       return system_colors_[COLOR_WINDOW];
     case kColorId_ResultsTableHoveredBackground:
       return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHT],
                                      system_colors_[COLOR_WINDOW], 0x40);
     case kColorId_ResultsTableSelectedBackground:
@@ skipping 1497 matching lines @@
     break;
   case LAST:
     NOTREACHED();
     break;
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace ui