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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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/tree/tree_view.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) 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 #include "views/controls/textfield/textfield.h" 5 #include "views/controls/textfield/textfield.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gdk/gdkkeysyms.h> 8 #include <gdk/gdkkeysyms.h>
9 #endif 9 #endif
10 10
11 #include <string> 11 #include <string>
12 12
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "ui/base/accessibility/accessible_view_state.h" 15 #include "ui/base/accessibility/accessible_view_state.h"
16 #include "ui/base/ime/text_input_type.h" 16 #include "ui/base/ime/text_input_type.h"
17 #include "ui/base/keycodes/keyboard_codes.h" 17 #include "ui/base/keycodes/keyboard_codes.h"
18 #include "ui/base/range/range.h" 18 #include "ui/base/range/range.h"
19 #include "ui/gfx/insets.h" 19 #include "ui/gfx/insets.h"
20 #include "ui/gfx/selection_model.h" 20 #include "ui/gfx/selection_model.h"
21 #include "ui/views/widget/widget.h"
21 #include "views/controls/native/native_view_host.h" 22 #include "views/controls/native/native_view_host.h"
22 #include "views/controls/textfield/native_textfield_wrapper.h" 23 #include "views/controls/textfield/native_textfield_wrapper.h"
23 #include "views/controls/textfield/textfield_controller.h" 24 #include "views/controls/textfield/textfield_controller.h"
24 #include "views/widget/widget.h"
25 25
26 #if defined(OS_LINUX) 26 #if defined(OS_LINUX)
27 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" 27 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
28 #elif defined(OS_WIN) 28 #elif defined(OS_WIN)
29 #include "base/win/win_util.h" 29 #include "base/win/win_util.h"
30 // TODO(beng): this should be removed when the OS_WIN hack from 30 // TODO(beng): this should be removed when the OS_WIN hack from
31 // ViewHierarchyChanged is removed. 31 // ViewHierarchyChanged is removed.
32 #include "views/controls/textfield/native_textfield_views.h" 32 #include "views/controls/textfield/native_textfield_views.h"
33 #include "views/controls/textfield/native_textfield_win.h" 33 #include "views/controls/textfield/native_textfield_win.h"
34 #endif 34 #endif
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 } 444 }
445 #endif 445 #endif
446 } 446 }
447 } 447 }
448 448
449 std::string Textfield::GetClassName() const { 449 std::string Textfield::GetClassName() const {
450 return kViewClassName; 450 return kViewClassName;
451 } 451 }
452 452
453 } // namespace views 453 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/textfield/native_textfield_win.cc ('k') | views/controls/tree/tree_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698