Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1265)

Side by Side Diff: views/controls/textfield/textfield.h

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed review issue Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #if defined(OS_LINUX)
12 #include <gdk/gdk.h>
13 #endif
14
15 #include <string> 11 #include <string>
16 12
17 #include "base/basictypes.h" 13 #include "base/basictypes.h"
18 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
19 #include "base/string16.h" 15 #include "base/string16.h"
20 #include "third_party/skia/include/core/SkColor.h" 16 #include "third_party/skia/include/core/SkColor.h"
21 #include "ui/base/ime/text_input_type.h" 17 #include "ui/base/ime/text_input_type.h"
22 #include "ui/base/keycodes/keyboard_codes.h" 18 #include "ui/base/keycodes/keyboard_codes.h"
23 #include "ui/gfx/font.h" 19 #include "ui/gfx/font.h"
24 #include "ui/gfx/native_widget_types.h" 20 #include "ui/gfx/native_widget_types.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 297
302 // The input type of this text field. 298 // The input type of this text field.
303 ui::TextInputType text_input_type_; 299 ui::TextInputType text_input_type_;
304 300
305 DISALLOW_COPY_AND_ASSIGN(Textfield); 301 DISALLOW_COPY_AND_ASSIGN(Textfield);
306 }; 302 };
307 303
308 } // namespace views 304 } // namespace views
309 305
310 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 306 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
OLDNEW
« no previous file with comments | « views/controls/textfield/native_textfield_views_unittest.cc ('k') | views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698