Make text input type and password visibility bit independent in Textfield

ui/views/controls/textfield/textfield.cc

 // Copyright (c) 2011 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/views/controls/textfield/textfield.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdkkeysyms.h>
 #endif
 
@@ skipping 57 matching lines @@
       draw_border_(true),
       text_color_(SK_ColorBLACK),
       use_default_text_color_(true),
       background_color_(SK_ColorWHITE),
       use_default_background_color_(true),
       initialized_(false),
       horizontal_margins_were_set_(false),
       vertical_margins_were_set_(false),
       text_input_type_(ui::TEXT_INPUT_TYPE_TEXT) {
   set_focusable(true);
-  if (IsPassword())
+  if (IsObscured())
     SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
 }
 
 Textfield::~Textfield() {
 }
 
 void Textfield::SetController(TextfieldController* controller) {
   controller_ = controller;
 }
 
 TextfieldController* Textfield::GetController() const {
   return controller_;
 }
 
 void Textfield::SetReadOnly(bool read_only) {
   read_only_ = read_only;
   if (native_wrapper_) {
     native_wrapper_->UpdateReadOnly();
     native_wrapper_->UpdateTextColor();
     native_wrapper_->UpdateBackgroundColor();
   }
 }
 
-bool Textfield::IsPassword() const {
-  return style_ & STYLE_PASSWORD;
+bool Textfield::IsObscured() const {
+  return style_ & STYLE_OBSCURED;
 }
 
-void Textfield::SetPassword(bool password) {
-  if (password) {
-    style_ = static_cast<StyleFlags>(style_ | STYLE_PASSWORD);
-    SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
-  } else {
-    style_ = static_cast<StyleFlags>(style_ & ~STYLE_PASSWORD);
-    SetTextInputType(ui::TEXT_INPUT_TYPE_TEXT);
+void Textfield::SetObscured(bool obscure) {
+  if (obscure != IsObscured()) {
+    style_ = static_cast<StyleFlags>(style_ ^ STYLE_OBSCURED);
+    if (native_wrapper_)
+      native_wrapper_->UpdateIsObscured();
   }
-  if (native_wrapper_)
-    native_wrapper_->UpdateIsPassword();
 }
 
-
 ui::TextInputType Textfield::GetTextInputType() const {
   if (read_only() || !IsEnabled())
     return ui::TEXT_INPUT_TYPE_NONE;
   return text_input_type_;
 }
 
 void Textfield::SetTextInputType(ui::TextInputType type) {
   text_input_type_ = type;
-  bool should_be_password = type == ui::TEXT_INPUT_TYPE_PASSWORD;
-  if (IsPassword() != should_be_password)
-    SetPassword(should_be_password);
 }
 
 void Textfield::SetText(const string16& text) {
   text_ = text;
   if (native_wrapper_)
     native_wrapper_->UpdateText();
 }
 
 void Textfield::AppendText(const string16& text) {
   text_ += text;
@@ skipping 100 matching lines @@
 
 void Textfield::UpdateAllProperties() {
   if (native_wrapper_) {
     native_wrapper_->UpdateText();
     native_wrapper_->UpdateTextColor();
     native_wrapper_->UpdateBackgroundColor();
     native_wrapper_->UpdateReadOnly();
     native_wrapper_->UpdateFont();
     native_wrapper_->UpdateEnabled();
     native_wrapper_->UpdateBorder();
-    native_wrapper_->UpdateIsPassword();
+    native_wrapper_->UpdateIsObscured();
     native_wrapper_->UpdateHorizontalMargins();
     native_wrapper_->UpdateVerticalMargins();
   }
 }
 
 void Textfield::SyncText() {
   if (native_wrapper_) {
     string16 new_text = native_wrapper_->GetText();
     if (new_text != text_) {
       text_ = new_text;
@@ skipping 131 matching lines @@
 void Textfield::OnBlur() {
   if (native_wrapper_)
     native_wrapper_->HandleBlur();
 }
 
 void Textfield::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TEXT;
   state->name = accessible_name_;
   if (read_only())
     state->state |= ui::AccessibilityTypes::STATE_READONLY;
-  if (IsPassword())
+  if (IsObscured())
     state->state |= ui::AccessibilityTypes::STATE_PROTECTED;
   state->value = text_;
 
   DCHECK(native_wrapper_);
   ui::Range range;
   native_wrapper_->GetSelectedRange(&range);
   state->selection_start = range.start();
   state->selection_end = range.end();
 }
 
@@ skipping 31 matching lines @@
     }
 #endif
   }
 }
 
 std::string Textfield::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views