| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ | 5 #ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ |
| 6 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ | 6 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ |
| 7 | 7 |
| 8 #if defined (OS_LINUX) | 8 #if defined (OS_LINUX) |
| 9 #include <gdk/gdk.h> | 9 #include <gdk/gdk.h> |
| 10 #endif | 10 #endif |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 // Textfield's background color. | 278 // Textfield's background color. |
| 279 bool use_default_background_color_; | 279 bool use_default_background_color_; |
| 280 | 280 |
| 281 // The number of lines of text this Textfield displays at once. | 281 // The number of lines of text this Textfield displays at once. |
| 282 int num_lines_; | 282 int num_lines_; |
| 283 | 283 |
| 284 // TODO(beng): remove this once NativeTextfieldWin subclasses | 284 // TODO(beng): remove this once NativeTextfieldWin subclasses |
| 285 // NativeControlWin. | 285 // NativeControlWin. |
| 286 bool initialized_; | 286 bool initialized_; |
| 287 | 287 |
| 288 // The storage string for the accessibility name associated with this control. | |
| 289 std::wstring accessible_name_; | |
| 290 | |
| 291 // Text to display when empty. | 288 // Text to display when empty. |
| 292 string16 text_to_display_when_empty_; | 289 string16 text_to_display_when_empty_; |
| 293 | 290 |
| 294 DISALLOW_COPY_AND_ASSIGN(Textfield); | 291 DISALLOW_COPY_AND_ASSIGN(Textfield); |
| 295 }; | 292 }; |
| 296 | 293 |
| 297 } // namespace views | 294 } // namespace views |
| 298 | 295 |
| 299 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ | 296 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ |
| OLD | NEW |