Adds the ability to display text in a textfield when the text is

views/controls/textfield/textfield.h

 // Copyright (c) 2010 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.
 
 #ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 
 #if defined (OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
 #include <string>
 
 #include "app/gfx/font.h"
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
+#include "base/logging.h"
 #include "base/string16.h"
 #include "views/view.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 #ifdef UNIT_TEST
 #include "gfx/native_widget_types.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #endif
 
 namespace views {
@@ skipping 144 matching lines @@
   // 32 bit number, so the left and right margins are effectively 16 bits.
   void SetHorizontalMargins(int left, int right);
 
   // Should only be called on a multi-line text field. Sets how many lines of
   // text can be displayed at once by this text field.
   void SetHeightInLines(int num_lines);
 
   // Sets the default width of the text control. See default_width_in_chars_.
   void set_default_width_in_chars(int default_width) {
     default_width_in_chars_ = default_width;
+#if !defined(OS_LINUX)
+    NOTIMPLEMENTED();
+#endif
   }
 
   // Removes the border from the edit box, giving it a 2D look.
   bool draw_border() const { return draw_border_; }
   void RemoveBorder();
 
+  // Sets the text to display when empty.
+  void set_text_to_display_when_empty(const string16& text) {
+    text_to_display_when_empty_ = text;
+  }
+  const string16& text_to_display_when_empty() {
+    return text_to_display_when_empty_;
+  }
+
   // Updates all properties on the textfield. This is invoked internally.
   // Users of Textfield never need to invoke this directly.
   void UpdateAllProperties();
 
   // Invoked by the edit control when the value changes. This method set
   // the text_ member variable to the value contained in edit control.
   // This is important because the edit control can be replaced if it has
   // been deleted during a window close.
   void SyncText();
 
@@ skipping 70 matching lines @@
   // The number of lines of text this Textfield displays at once.
   int num_lines_;
 
   // TODO(beng): remove this once NativeTextfieldWin subclasses
   //             NativeControlWin.
   bool initialized_;
 
   // The storage string for the accessibility name associated with this control.
   std::wstring accessible_name_;
 
+  // Text to display when empty.
+  string16 text_to_display_when_empty_;
+
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_