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

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

Issue 759433002: Reland: Move TouchSelectionController from content to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for ios build and some typos Created 6 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 5 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
6 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 6 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "base/timer/timer.h" 15 #include "base/timer/timer.h"
16 #include "third_party/skia/include/core/SkColor.h" 16 #include "third_party/skia/include/core/SkColor.h"
17 #include "ui/base/ime/text_input_client.h" 17 #include "ui/base/ime/text_input_client.h"
18 #include "ui/base/ime/text_input_type.h" 18 #include "ui/base/ime/text_input_type.h"
19 #include "ui/base/models/simple_menu_model.h" 19 #include "ui/base/models/simple_menu_model.h"
20 #include "ui/base/touch/selection_bound.h"
mfomitchev 2014/12/01 21:36:24 Can move include to cc.
mohsen 2014/12/02 05:17:03 Done.
20 #include "ui/base/touch/touch_editing_controller.h" 21 #include "ui/base/touch/touch_editing_controller.h"
21 #include "ui/events/keycodes/keyboard_codes.h" 22 #include "ui/events/keycodes/keyboard_codes.h"
22 #include "ui/gfx/font_list.h" 23 #include "ui/gfx/font_list.h"
23 #include "ui/gfx/range/range.h" 24 #include "ui/gfx/range/range.h"
24 #include "ui/gfx/selection_model.h" 25 #include "ui/gfx/selection_model.h"
25 #include "ui/gfx/text_constants.h" 26 #include "ui/gfx/text_constants.h"
26 #include "ui/views/context_menu_controller.h" 27 #include "ui/views/context_menu_controller.h"
27 #include "ui/views/controls/textfield/textfield_model.h" 28 #include "ui/views/controls/textfield/textfield_model.h"
28 #include "ui/views/drag_controller.h" 29 #include "ui/views/drag_controller.h"
29 #include "ui/views/view.h" 30 #include "ui/views/view.h"
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 472
472 // Used to bind callback functions to this object. 473 // Used to bind callback functions to this object.
473 base::WeakPtrFactory<Textfield> weak_ptr_factory_; 474 base::WeakPtrFactory<Textfield> weak_ptr_factory_;
474 475
475 DISALLOW_COPY_AND_ASSIGN(Textfield); 476 DISALLOW_COPY_AND_ASSIGN(Textfield);
476 }; 477 };
477 478
478 } // namespace views 479 } // namespace views
479 480
480 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 481 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698