| Index: ui/views/controls/textfield/textfield.h
|
| diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h
|
| index ea0bb767f007095a387b4a509332855acc4e750f..26e3549e73cecf527d9213e211686bd863655dea 100644
|
| --- a/ui/views/controls/textfield/textfield.h
|
| +++ b/ui/views/controls/textfield/textfield.h
|
| @@ -99,18 +99,31 @@ class VIEWS_EXPORT Textfield : public View,
|
| // Checks if there is any selected text.
|
| bool HasSelection() const;
|
|
|
| - // Gets/Sets the text color to be used when painting the Textfield.
|
| - // Call |UseDefaultTextColor| to restore the default system color.
|
| + // Gets/sets the text color to be used when painting the Textfield.
|
| + // Call UseDefaultTextColor() to restore the default system color.
|
| SkColor GetTextColor() const;
|
| void SetTextColor(SkColor color);
|
| void UseDefaultTextColor();
|
|
|
| - // Gets/Sets the background color to be used when painting the Textfield.
|
| - // Call |UseDefaultBackgroundColor| to restore the default system color.
|
| + // Gets/sets the background color to be used when painting the Textfield.
|
| + // Call UseDefaultBackgroundColor() to restore the default system color.
|
| SkColor GetBackgroundColor() const;
|
| void SetBackgroundColor(SkColor color);
|
| void UseDefaultBackgroundColor();
|
|
|
| + // Gets/sets the selection text color to be used when painting the Textfield.
|
| + // Call UseDefaultSelectionTextColor() to restore the default system color.
|
| + SkColor GetSelectionTextColor() const;
|
| + void SetSelectionTextColor(SkColor color);
|
| + void UseDefaultSelectionTextColor();
|
| +
|
| + // Gets/sets the selection background color to be used when painting the
|
| + // Textfield. Call UseDefaultSelectionBackgroundColor() to restore the default
|
| + // system color.
|
| + SkColor GetSelectionBackgroundColor() const;
|
| + void SetSelectionBackgroundColor(SkColor color);
|
| + void UseDefaultSelectionBackgroundColor();
|
| +
|
| // Gets/Sets whether or not the cursor is enabled.
|
| bool GetCursorEnabled() const;
|
| void SetCursorEnabled(bool enabled);
|
| @@ -380,16 +393,22 @@ class VIEWS_EXPORT Textfield : public View,
|
|
|
| // Text color. Only used if |use_default_text_color_| is false.
|
| SkColor text_color_;
|
| -
|
| - // 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_;
|
|
|
| + // Selection text color. Only used if |use_default_selection_text_color_| is
|
| + // false.
|
| + SkColor selection_text_color_;
|
| + bool use_default_selection_text_color_;
|
| +
|
| + // Selection background color. Only used if
|
| + // |use_default_selection_background_color_| is false.
|
| + SkColor selection_background_color_;
|
| + bool use_default_selection_background_color_;
|
| +
|
| // Text to display when empty.
|
| base::string16 placeholder_text_;
|
|
|
|
|