Make text input type and password visibility bit independent in Textfield

ui/views/controls/textfield/textfield.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/views/controls/textfield/textfield.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdkkeysyms.h>
 #endif
 
@@ skipping 87 matching lines @@
     native_wrapper_->UpdateTextColor();
     native_wrapper_->UpdateBackgroundColor();
   }
 }
 
 bool Textfield::IsObscured() const {
   return style_ & STYLE_OBSCURED;
 }
 
 void Textfield::SetObscured(bool obscured) {
-  if (obscured) {
-    style_ = static_cast<StyleFlags>(style_ | STYLE_OBSCURED);
-    SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
-  } else {
-    style_ = static_cast<StyleFlags>(style_ & ~STYLE_OBSCURED);
-    SetTextInputType(ui::TEXT_INPUT_TYPE_TEXT);
+  if (obscured != IsObscured()) {
+    style_ = static_cast<StyleFlags>(style_ ^ STYLE_OBSCURED);
+    if (native_wrapper_)
+      native_wrapper_->UpdateIsObscured();
   }
-  if (native_wrapper_)
-    native_wrapper_->UpdateIsObscured();
 }
 
-
 ui::TextInputType Textfield::GetTextInputType() const {
   if (read_only() || !enabled())
     return ui::TEXT_INPUT_TYPE_NONE;
   return text_input_type_;
 }
 
 void Textfield::SetTextInputType(ui::TextInputType type) {
   text_input_type_ = type;
-  bool should_be_obscured = type == ui::TEXT_INPUT_TYPE_PASSWORD;
-  if (IsObscured() != should_be_obscured)
-    SetObscured(should_be_obscured);
 }
 
 void Textfield::SetText(const string16& text) {
   text_ = text;
   if (native_wrapper_)
     native_wrapper_->UpdateText();
 }
 
 void Textfield::AppendText(const string16& text) {
   text_ += text;
@@ skipping 307 matching lines @@
     }
 #endif
   }
 }
 
 std::string Textfield::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views