Use native theme colors for textfields; etc.

ui/native_theme/native_theme_aura.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_aura.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 23 matching lines @@
 const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor;
 const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor;
 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1);
 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED);
 // Label:
 const SkColor kLabelEnabledColor = kTextButtonEnabledColor;
 const SkColor kLabelDisabledColor = kTextButtonDisabledColor;
 const SkColor kLabelBackgroundColor = SK_ColorWHITE;
 // Textfield:
 const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;

[varunjain, 2012/12/04 23:05:31]

this one

[msw, 2012/12/05 02:09:56]

I in-lined the CrOS case into GetColor, as explained above.

+const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY;
+const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE;
 const SkColor kTextfieldSelectionBackgroundFocused =
     SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB);
 const SkColor kTextfieldSelectionBackgroundUnfocused = SK_ColorLTGRAY;
 const SkColor kTextfieldSelectionColor =
     color_utils::AlphaBlend(SK_ColorBLACK,
         kTextfieldSelectionBackgroundFocused, 0xdd);
 
 }  // namespace
 
 namespace ui {
@@ skipping 59 matching lines @@
     case kColorId_LabelDisabledColor:
       return kLabelDisabledColor;
     case kColorId_LabelBackgroundColor:
       return kLabelBackgroundColor;
 
     // Textfield
     case kColorId_TextfieldDefaultColor:
       return kTextfieldDefaultColor;
     case kColorId_TextfieldDefaultBackground:
       return kTextfieldDefaultBackground;
+    case kColorId_TextfieldReadOnlyColor:
+      return kTextfieldReadOnlyColor;
+    case kColorId_TextfieldReadOnlyBackground:
+      return kTextfieldReadOnlyBackground;
     case kColorId_TextfieldSelectionColor:
       return kTextfieldSelectionColor;
     case kColorId_TextfieldSelectionBackgroundFocused:
       return kTextfieldSelectionBackgroundFocused;
     case kColorId_TextfieldSelectionBackgroundUnfocused:
       return kTextfieldSelectionBackgroundUnfocused;
 
     default:
       NOTREACHED() << "Invalid color_id: " << color_id;
       break;
@@ skipping 153 matching lines @@
       DrawTiledImage(canvas, *center,
                      0, 0, 1.0, 1.0,
                      rect.x() + left->width(), rect.y(),
                      rect.width() - left->width() - right->width(),
                      center->height());
     }
   }
 }
 
 }  // namespace ui