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_->IsObscured())
     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_->IsObscured());
     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 126 matching lines @@
 }
 
 void NativeTextfieldWin::UpdateFont() {
   SendMessage(m_hWnd, WM_SETFONT,
               reinterpret_cast<WPARAM>(textfield_->font().GetNativeFont()),
               TRUE);
   // Setting the font blows away any text color we've set, so reset it.
   UpdateTextColor();
 }
 
-void NativeTextfieldWin::UpdateIsPassword() {
+void NativeTextfieldWin::UpdateIsObscured() {
   // TODO: Need to implement for Windows.
-  UpdateAccessibleState(STATE_SYSTEM_PROTECTED, textfield_->IsPassword());
+  UpdateAccessibleState(STATE_SYSTEM_PROTECTED, textfield_->IsObscured());
 }
 
 void NativeTextfieldWin::UpdateEnabled() {
   SendMessage(m_hWnd, WM_ENABLE, textfield_->IsEnabled(), 0);
   UpdateAccessibleState(STATE_SYSTEM_UNAVAILABLE, !textfield_->IsEnabled());
 }
 
 gfx::Insets NativeTextfieldWin::CalculateInsets() {
   // NOTE: One would think GetThemeMargins would return the insets we should
   // use, but it doesn't. The margins returned by GetThemeMargins are always
@@ skipping 112 matching lines @@
 // NativeTextfieldWin, ui::SimpleMenuModel::Delegate implementation:
 
 bool NativeTextfieldWin::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
 bool NativeTextfieldWin::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case IDS_APP_UNDO:       return !textfield_->read_only() && !!CanUndo();
     case IDS_APP_CUT:        return !textfield_->read_only() &&
-                                    !textfield_->IsPassword() && !!CanCut();
-    case IDS_APP_COPY:       return !!CanCopy() && !textfield_->IsPassword();
+                                    !textfield_->IsObscured() && !!CanCut();
+    case IDS_APP_COPY:       return !!CanCopy() && !textfield_->IsObscured();
     case IDS_APP_PASTE:      return !textfield_->read_only() && !!CanPaste();
     case IDS_APP_SELECT_ALL: return !!CanSelectAll();
     default:                 NOTREACHED();
                              return false;
   }
 }
 
 bool NativeTextfieldWin::GetAcceleratorForCommandId(int command_id,
     ui::Accelerator* accelerator) {
   // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
@@ skipping 105 matching lines @@
   POINT p(point);
   if (point.x == -1 || point.y == -1) {
     GetCaretPos(&p);
     MapWindowPoints(HWND_DESKTOP, &p, 1);
   }
   BuildContextMenu();
   context_menu_->RunContextMenuAt(gfx::Point(p));
 }
 
 void NativeTextfieldWin::OnCopy() {
-  if (textfield_->IsPassword())
+  if (textfield_->IsObscured())
     return;
 
   const string16 text(GetSelectedText());
   if (!text.empty() && ViewsDelegate::views_delegate) {
     ui::ScopedClipboardWriter scw(
         ViewsDelegate::views_delegate->GetClipboard());
     scw.WriteText(text);
   }
 }
 
 void NativeTextfieldWin::OnCut() {
-  if (textfield_->read_only() || textfield_->IsPassword())
+  if (textfield_->read_only() || textfield_->IsObscured())
     return;
 
   OnCopy();
 
   // This replace selection will have no effect (even on the undo stack) if the
   // current selection is empty.
   ReplaceSel(L"", true);
 }
 
 LRESULT NativeTextfieldWin::OnImeChar(UINT message,
@@ skipping 605 matching lines @@
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   if (views::Widget::IsPureViews())
     return new NativeTextfieldViews(field);
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views