Make text input type and password visibility bit independent in Textfield

ui/views/controls/textfield/native_textfield_win.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/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
@@ skipping 82 matching lines @@
       contains_mouse_(false),
       ime_discard_composition_(false),
       ime_composition_start_(0),
       ime_composition_length_(0),
       container_view_(new NativeViewHost),
       bg_color_(0) {
   if (!did_load_library_)
     did_load_library_ = !!LoadLibrary(L"riched20.dll");
 
   DWORD style = kDefaultEditStyle | ES_AUTOHSCROLL;
-  if (textfield_->style() & Textfield::STYLE_PASSWORD)
+  if (textfield_->IsPassword())
     style |= ES_PASSWORD;
 
   if (textfield_->read_only())
     style |= ES_READONLY;
 
   // Make sure we apply RTL related extended window styles if necessary.
   DWORD ex_style = l10n_util::GetExtendedStyles();
 
   RECT r = {0, 0, textfield_->width(), textfield_->height()};
   Create(textfield_->GetWidget()->GetNativeView(), r, NULL, style, ex_style);
 
   if (textfield_->style() & Textfield::STYLE_LOWERCASE) {
-    DCHECK((textfield_->style() & Textfield::STYLE_PASSWORD) == 0);
+    DCHECK(!textfield_->IsPassword());
     SetEditStyle(SES_LOWERCASE, SES_LOWERCASE);
   }
 
   // Set up the text_object_model_.
   base::win::ScopedComPtr<IRichEditOle, &IID_IRichEditOle> ole_interface;
   ole_interface.Attach(GetOleInterface());
   if (ole_interface)
     text_object_model_.QueryFrom(ole_interface);
 
   InitializeAccessibilityInfo();
@@ skipping 1026 matching lines @@
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   if (views::Widget::IsPureViews())
     return new NativeTextfieldViews(field);
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views