| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #if defined (OS_LINUX) | 9 #include "build/build_config.h" |
| 10 |
| 11 #if defined(OS_LINUX) |
| 10 #include <gdk/gdk.h> | 12 #include <gdk/gdk.h> |
| 11 #endif | 13 #endif |
| 12 | 14 |
| 13 #include <string> | 15 #include <string> |
| 14 | 16 |
| 15 #include "base/basictypes.h" | 17 #include "base/basictypes.h" |
| 16 #include "base/keyboard_codes.h" | 18 #include "base/keyboard_codes.h" |
| 19 #if !defined(OS_LINUX) |
| 17 #include "base/logging.h" | 20 #include "base/logging.h" |
| 21 #endif |
| 18 #include "base/string16.h" | 22 #include "base/string16.h" |
| 19 #include "gfx/font.h" | 23 #include "gfx/font.h" |
| 20 #include "views/view.h" | 24 #include "views/view.h" |
| 21 #include "third_party/skia/include/core/SkColor.h" | 25 #include "third_party/skia/include/core/SkColor.h" |
| 22 | 26 |
| 23 #ifdef UNIT_TEST | 27 #ifdef UNIT_TEST |
| 24 #include "gfx/native_widget_types.h" | 28 #include "gfx/native_widget_types.h" |
| 25 #include "views/controls/textfield/native_textfield_wrapper.h" | 29 #include "views/controls/textfield/native_textfield_wrapper.h" |
| 26 #endif | 30 #endif |
| 27 | 31 |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 | 292 |
| 289 // Text to display when empty. | 293 // Text to display when empty. |
| 290 string16 text_to_display_when_empty_; | 294 string16 text_to_display_when_empty_; |
| 291 | 295 |
| 292 DISALLOW_COPY_AND_ASSIGN(Textfield); | 296 DISALLOW_COPY_AND_ASSIGN(Textfield); |
| 293 }; | 297 }; |
| 294 | 298 |
| 295 } // namespace views | 299 } // namespace views |
| 296 | 300 |
| 297 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ | 301 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ |
| OLD | NEW |