Views Textfield fixes and cleanup.

chrome/browser/ui/views/edit_search_engine_dialog.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 "chrome/browser/ui/views/edit_search_engine_dialog.h"
 
+#include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 78 matching lines @@
 
 bool EditSearchEngineDialog::Accept() {
   controller_->AcceptAddOrEdit(title_tf_->text(), keyword_tf_->text(),
                                base::UTF16ToUTF8(url_tf_->text()));
   return true;
 }
 
 void EditSearchEngineDialog::ContentsChanged(
     Textfield* sender,
     const base::string16& new_contents) {
+  // Force the keyword text to be lowercase, keep the caret or selection.
+  if (sender == keyword_tf_) {
+    const gfx::SelectionModel selection_model = sender->GetSelectionModel();
+    sender->SetText(base::i18n::ToLower(new_contents));
+    sender->SelectSelectionModel(selection_model);

[sky, 2014/01/14 23:17:13]

This seems really heavyweight and easy to lose state. For example, what about if
not all the text is visible. Does doing this force scrolling to a certain
region?

[msw, 2014/01/15 01:22:03]

The ToT implementation is worse, it actually clamps the cursor to the end of the
input after entering an uppercase value anywhere in the string, and leaves it
there! Restoring the selection model is actually an improvement. This specific
patch set *did* break IME input here, but the new patch set fixes that issue.

But yes, setting a cursor/selection does indeed scroll to show the cursor (or
the selection range's end), and calling SetText forces the cursor to the end of
the textfield. So, it may scroll jarringly when you start typing in the middle
of a long string. I added a TODO to address this pre-existing defect later.

+  }
+
   GetDialogClientView()->UpdateDialogButtons();
   UpdateImageViews();
 }
 
 bool EditSearchEngineDialog::HandleKeyEvent(
     Textfield* sender,
     const ui::KeyEvent& key_event) {
   return false;
 }
 
 void EditSearchEngineDialog::Init() {
   // Create the views we'll need.
   if (controller_->template_url()) {
-    title_tf_ = CreateTextfield(controller_->template_url()->short_name(),
-                                false);
-    keyword_tf_ = CreateTextfield(controller_->template_url()->keyword(), true);
+    title_tf_ = CreateTextfield(controller_->template_url()->short_name());
+    keyword_tf_ = CreateTextfield(controller_->template_url()->keyword());
     url_tf_ = CreateTextfield(
-        controller_->template_url()->url_ref().DisplayURL(), false);
+        controller_->template_url()->url_ref().DisplayURL());
     // We don't allow users to edit prepopulate URLs. This is done as
     // occasionally we need to update the URL of prepopulated TemplateURLs.
     url_tf_->SetReadOnly(controller_->template_url()->prepopulate_id() != 0);
   } else {
-    title_tf_ = CreateTextfield(base::string16(), false);
-    keyword_tf_ = CreateTextfield(base::string16(), true);
-    url_tf_ = CreateTextfield(base::string16(), false);
+    title_tf_ = CreateTextfield(base::string16());
+    keyword_tf_ = CreateTextfield(base::string16());
+    url_tf_ = CreateTextfield(base::string16());
   }
   title_iv_ = new views::ImageView();
   keyword_iv_ = new views::ImageView();
   url_iv_ = new views::ImageView();
 
   UpdateImageViews();
 
   const int related_x = views::kRelatedControlHorizontalSpacing;
   const int related_y = views::kRelatedControlVerticalSpacing;
   const int unrelated_y = views::kUnrelatedControlVerticalSpacing;
@@ skipping 76 matching lines @@
   layout->AddPaddingRow(0, related_y);
 }
 
 views::Label* EditSearchEngineDialog::CreateLabel(int message_id) {
   views::Label* label =
       new views::Label(l10n_util::GetStringUTF16(message_id));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   return label;
 }
 
-Textfield* EditSearchEngineDialog::CreateTextfield(const base::string16& text,
-                                                   bool lowercase) {
-  Textfield* text_field = new Textfield(
-      lowercase ? Textfield::STYLE_LOWERCASE : Textfield::STYLE_DEFAULT);
+Textfield* EditSearchEngineDialog::CreateTextfield(const base::string16& text) {
+  Textfield* text_field = new Textfield();
   text_field->SetText(text);
-  text_field->SetController(this);
+  text_field->set_controller(this);
   return text_field;
 }
 
 void EditSearchEngineDialog::UpdateImageViews() {
   UpdateImageView(keyword_iv_, controller_->IsKeywordValid(keyword_tf_->text()),
                   IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT);
   UpdateImageView(url_iv_,
                   controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->text())),
                   IDS_SEARCH_ENGINES_INVALID_URL_TT);
   UpdateImageView(title_iv_, controller_->IsTitleValid(title_tf_->text()),
                   IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
 }
 
 void EditSearchEngineDialog::UpdateImageView(views::ImageView* image_view,
                                              bool is_valid,
                                              int invalid_message_id) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (is_valid) {
     image_view->SetTooltipText(base::string16());
     image_view->SetImage(rb.GetImageSkiaNamed(IDR_INPUT_GOOD));
   } else {
     image_view->SetTooltipText(l10n_util::GetStringUTF16(invalid_message_id));
     image_view->SetImage(rb.GetImageSkiaNamed(IDR_INPUT_ALERT));
   }
 }