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

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

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « views/controls/textfield/native_textfield_win.cc ('k') | views/controls/textfield/textfield.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #if defined(OS_LINUX) 11 #if defined(OS_LINUX)
12 #include <gdk/gdk.h> 12 #include <gdk/gdk.h>
13 #endif 13 #endif
14 14
15 #include <string> 15 #include <string>
16 16
17 #include "app/keyboard_codes.h"
18 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/string16.h"
19 #include "gfx/font.h"
20 #include "third_party/skia/include/core/SkColor.h"
21 #include "ui/base/keycodes/keyboard_codes.h"
22 #include "views/view.h"
23
19 #if !defined(OS_LINUX) 24 #if !defined(OS_LINUX)
20 #include "base/logging.h" 25 #include "base/logging.h"
21 #endif 26 #endif
22 #include "base/string16.h"
23 #include "gfx/font.h"
24 #include "views/view.h"
25 #include "third_party/skia/include/core/SkColor.h"
26
27 #ifdef UNIT_TEST 27 #ifdef UNIT_TEST
28 #include "gfx/native_widget_types.h" 28 #include "gfx/native_widget_types.h"
29 #include "views/controls/textfield/native_textfield_wrapper.h" 29 #include "views/controls/textfield/native_textfield_wrapper.h"
30 #endif 30 #endif
31 31
32 namespace views { 32 namespace views {
33 33
34 class KeyEvent; 34 class KeyEvent;
35 35
36 class NativeTextfieldWrapper; 36 class NativeTextfieldWrapper;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 // Text to display when empty. 279 // Text to display when empty.
280 string16 text_to_display_when_empty_; 280 string16 text_to_display_when_empty_;
281 281
282 DISALLOW_COPY_AND_ASSIGN(Textfield); 282 DISALLOW_COPY_AND_ASSIGN(Textfield);
283 }; 283 };
284 284
285 } // namespace views 285 } // namespace views
286 286
287 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 287 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
OLDNEW
« no previous file with comments | « views/controls/textfield/native_textfield_win.cc ('k') | views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698