Views Textfield fixes and cleanup.

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 27 matching lines @@
 class VIEWS_EXPORT Textfield : public View,
                                public TextfieldModel::Delegate,
                                public ContextMenuController,
                                public DragController,
                                public ui::TouchEditable,
                                public ui::TextInputClient {
  public:
   // The textfield's class name.
   static const char kViewClassName[];
 
-  enum StyleFlags {
-    STYLE_DEFAULT   = 0,
-    STYLE_OBSCURED  = 1 << 0,
-    STYLE_LOWERCASE = 1 << 1
-  };
-
   // Returns the text cursor blink time in milliseconds, or 0 for no blinking.
   static size_t GetCaretBlinkMs();
 
   Textfield();
-  explicit Textfield(StyleFlags style);
   virtual ~Textfield();
 
-  // TextfieldController accessors
-  void SetController(TextfieldController* controller);
-  TextfieldController* GetController() const;
+  // Set the controller for this textfield.
+  void set_controller(TextfieldController* controller) {
+    controller_ = controller;
+  }
 
   // Gets/Sets whether or not the Textfield is read-only.
   bool read_only() const { return read_only_; }
   void SetReadOnly(bool read_only);
 
-  // Gets/sets the STYLE_OBSCURED bit, controlling whether characters in this
-  // Textfield are displayed as asterisks/bullets.
-  bool IsObscured() const;
-  void SetObscured(bool obscured);
-
-  // Sets the input type of this textfield.
+  // Sets the input type; displays only asterisks for TEXT_INPUT_TYPE_PASSWORD.
   void SetTextInputType(ui::TextInputType type);
 
   // Gets the text currently displayed in the Textfield.
   const base::string16& text() const { return model_->text(); }
 
   // Sets the text currently displayed in the Textfield.  This doesn't
   // change the cursor position if the current cursor is within the
   // new text's range, or moves the cursor to the end if the cursor is
   // out of the new text's range.
   void SetText(const base::string16& new_text);
@@ skipping 14 matching lines @@
   // the logical beginning of the text; this generally shows the leading portion
   // of text that overflows its display area.
   void SelectAll(bool reversed);
 
   // Clears the selection within the edit field and sets the caret to the end.
   void ClearSelection();
 
   // 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 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.
   SkColor GetBackgroundColor() const;
   void SetBackgroundColor(SkColor color);
@@ skipping 169 matching lines @@
   virtual void OnCandidateWindowHidden() OVERRIDE;
 
  protected:
    // Returns the TextfieldModel's text/cursor/selection rendering model.
    gfx::RenderText* GetRenderText() const;
 
  private:
   friend class TextfieldTest;
   friend class TouchSelectionControllerImplTest;
 
-  // Converts the raw text according to the current style, e.g. STYLE_LOWERCASE.
-  base::string16 GetTextForDisplay(const base::string16& raw);
-
   // Handles a request to change the value of this text field from software
   // using an accessibility API (typically automation software, screen readers
   // don't normally use this). Sets the value and clears the selection.
   void AccessibilitySetValue(const base::string16& new_value);
 
   // Updates the painted background color.
   void UpdateBackgroundColor();
 
   // Updates any colors that have not been explicitly set from the theme.
   void UpdateColorsFromTheme(const ui::NativeTheme* theme);
@@ skipping 33 matching lines @@
 
   // Utility function to prepare the context menu.
   void UpdateContextMenu();
 
   // Tracks the mouse clicks for single/double/triple clicks.
   void TrackMouseClicks(const ui::MouseEvent& event);
 
   // Returns true if the current text input type allows access by the IME.
   bool ImeEditingAllowed() const;
 
-  // Reveals the obscured char at |index| for the given |duration|. If |index|
-  // is -1, existing revealed index will be cleared.
-  void RevealObscuredChar(int index, const base::TimeDelta& duration);
+  // Reveals the password character at |index| for a set duration.
+  // If |index| is -1, the existing revealed character will be reset.
+  void RevealPasswordChar(int index);
 
   void CreateTouchSelectionControllerAndNotifyIt();
 
   // The text model.
   scoped_ptr<TextfieldModel> model_;
 
   // This is the current listener for events from this Textfield.
   TextfieldController* controller_;
 
-  // The mask of style options for this Textfield.
-  StyleFlags style_;
-
   // True if this Textfield cannot accept input and is read-only.
   bool read_only_;
 
   // The default number of average characters for the width of this text field.
   // This will be reported as the "desired size". Defaults to 0.
   int default_width_in_chars_;
 
   scoped_ptr<Painter> focus_painter_;
 
   // Text color.  Only used if |use_default_text_color_| is false.
@@ skipping 13 matching lines @@
 
   // Placeholder text color.
   SkColor placeholder_text_color_;
 
   // The accessible name of the text field.
   base::string16 accessible_name_;
 
   // The input type of this text field.
   ui::TextInputType text_input_type_;
 
-  // The duration to reveal the last typed char for obscured textfields.
-  base::TimeDelta obscured_reveal_duration_;
+  // The duration to reveal the last typed char for password textfields.
+  base::TimeDelta password_reveal_duration_;
 
   // True if InputMethod::CancelComposition() should not be called.
   bool skip_input_method_cancel_composition_;
 
   // The text editing cursor repaint timer and visibility.
   base::RepeatingTimer<Textfield> cursor_repaint_timer_;
   bool is_cursor_visible_;
 
   // The drop cursor is a visual cue for where dragged text will be dropped.
   bool is_drop_cursor_visible_;
   gfx::SelectionModel drop_cursor_position_;
 
   // Is the user potentially dragging and dropping from this view?
   bool initiating_drag_;
 
   // State variables used to track double and triple clicks.
   size_t aggregated_clicks_;
   base::TimeDelta last_click_time_;
   gfx::Point last_click_location_;
   gfx::Range double_click_word_;
 
   scoped_ptr<ui::TouchSelectionController> touch_selection_controller_;
 
   // A timer to control the duration of showing the last typed char in
-  // obscured text. When the timer is running, the last typed char is shown
-  // and when the time expires, the last typed char is obscured.
-  base::OneShotTimer<Textfield> obscured_reveal_timer_;
+  // password text. When the timer is running, the last typed char is shown
+  // and when the time expires, the last typed char is password.
+  base::OneShotTimer<Textfield> password_reveal_timer_;
 
   // Context menu related members.
   scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
   scoped_ptr<views::MenuRunner> context_menu_runner_;
 
   // Used to bind callback functions to this object.
   base::WeakPtrFactory<Textfield> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_