Support placeholder text in NativeTextfieldViews.

ui/views/controls/textfield/native_textfield_views.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/native_textfield_views.h"
 
 #include <algorithm>
+#include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_locale_settings.h"
 #include "grit/ui_strings.h"
@@ skipping 805 matching lines @@
       !textfield_->use_default_background_color() &&
       SkColorGetA(textfield_->background_color()) != 0xFF);
   GetRenderText()->set_cursor_visible(is_drop_cursor_visible_ ||
       (is_cursor_visible_ && !model_->HasSelection()));
   GetRenderText()->set_cursor_color(
       textfield_->use_default_cursor_color() ?
           kDefaultCursorColor :
           textfield_->cursor_color());
   // Draw the text, cursor, and selection.
   GetRenderText()->Draw(canvas);
+
+  // Draw placeholder text if needed.
+  if (model_->GetText().empty() &&

[msw, 2012/05/15 02:29:22]

Should placeholder text disappear on textfield focus?

[xiyuan, 2012/05/15 16:20:04]

I prefer to show placeholder even if the textfield is focused. This is inline
with the current webkit behavior and useful when there is only a focusable
textfield in the UI, like in new applist bubble.

+      !textfield_->placeholder_text().empty()) {
+    canvas->DrawStringInt(
+        textfield_->placeholder_text(),
+        GetRenderText()->GetFont(),
+        textfield_->placeholder_text_color(),
+        GetRenderText()->display_rect());
+  }
   canvas->Restore();
 }
 
 bool NativeTextfieldViews::HandleKeyEvent(const KeyEvent& key_event) {
   // TODO(oshima): Refactor and consolidate with ExecuteCommand.
   if (key_event.type() == ui::ET_KEY_PRESSED) {
     ui::KeyboardCode key_code = key_event.key_code();
     // TODO(oshima): shift-tab does not work. Figure out why and fix.
     if (key_code == ui::VKEY_TAB)
       return false;
@@ skipping 247 matching lines @@
   }
 }
 
 void NativeTextfieldViews::HandleMousePressEvent(const MouseEvent& event) {
   if (event.IsOnlyLeftMouseButton()) {
     textfield_->RequestFocus();
 
     initiating_drag_ = false;
     bool can_drag = true;
 
-    switch(aggregated_clicks_) {
+    switch (aggregated_clicks_) {
       case 0:
         if (can_drag && GetRenderText()->IsPointInSelection(event.location()))
           initiating_drag_ = true;
         else
           MoveCursorTo(event.location(), event.IsShiftDown());
         break;
       case 1:
         model_->SelectWord();
         OnCaretBoundsChanged();
         break;
@@ skipping 28 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldViews(field);
 }
 #endif
 
 }  // namespace views