Use native theme colors for textfields; etc.

ui/views/controls/textfield/textfield.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 90 matching lines @@
   // Clears the selection within the edit field and sets the caret to the end.
   void ClearSelection() const;
 
   // Checks if there is any selected text.
   bool HasSelection() const;
 
   // Accessor for |style_|.
   StyleFlags style() const { return style_; }
 
   // Gets/Sets the text color to be used when painting the Textfield.
-  // Call |UseDefaultTextColor| to return to the system default colors.
-  SkColor text_color() const { return text_color_; }
+  // Call |UseDefaultTextColor| to restore the default system color.
+  SkColor GetTextColor() const;
   void SetTextColor(SkColor color);
-
-  // Gets/Sets whether the default text color should be used when painting the
-  // Textfield.
-  bool use_default_text_color() const {
-    return use_default_text_color_;
-  }
   void UseDefaultTextColor();
 
   // Gets/Sets the background color to be used when painting the Textfield.
-  // Call |UseDefaultBackgroundColor| to return to the system default colors.
-  SkColor background_color() const { return background_color_; }
+  // Call |UseDefaultBackgroundColor| to restore the default system color.
+  SkColor GetBackgroundColor() const;
   void SetBackgroundColor(SkColor color);
-
-  // Gets/Sets whether the default background color should be used when painting
-  // the Textfield.
-  bool use_default_background_color() const {
-    return use_default_background_color_;
-  }
   void UseDefaultBackgroundColor();
 
-  // Gets/Sets the color to be used for the cursor.
-  SkColor cursor_color() const { return cursor_color_; }
-  void SetCursorColor(SkColor color);
-
-  // Gets/Sets whether we use the system's default color for the cursor.
-  bool use_default_cursor_color() const { return use_default_cursor_color_; }
-  void UseDefaultCursorColor();
+  // Gets/Sets whether or not the cursor is enabled.
+  bool GetCursorEnabled() const;
+  void SetCursorEnabled(bool enabled);
 
   // Gets/Sets the font used when rendering the text within the Textfield.
   const gfx::Font& font() const { return font_; }
   void SetFont(const gfx::Font& font);
 
   // Sets the left and right margin (in pixels) within the text box. On Windows
   // this is accomplished by packing the left and right margin into a single
   // 32 bit number, so the left and right margins are effectively 16 bits.
   void SetHorizontalMargins(int left, int right);
 
@@ skipping 145 matching lines @@
 
   // Should we use the system text color instead of |text_color_|?
   bool use_default_text_color_;
 
   // Background color.  Only used if |use_default_background_color_| is false.
   SkColor background_color_;
 
   // Should we use the system background color instead of |background_color_|?
   bool use_default_background_color_;
 
-  // Cursor color.  Only used if |use_default_cursor_color_| is false.
-  SkColor cursor_color_;
-
-  // Should we use the system cursor color instead of |cursor_color_|?
-  bool use_default_cursor_color_;
-
   // TODO(beng): remove this once NativeTextfieldWin subclasses
   //             NativeControlWin.
   bool initialized_;
 
   // Holds inner textfield margins.
   gfx::Insets margins_;
 
   // Holds whether margins were set.
   bool horizontal_margins_were_set_;
   bool vertical_margins_were_set_;
 
   // Text to display when empty.
   string16 placeholder_text_;
 
   // Placeholder text color.
   SkColor placeholder_text_color_;
 
   // The accessible name of the text field.
   string16 accessible_name_;
 
   // The input type of this text field.
   ui::TextInputType text_input_type_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_