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

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

Issue 2064053002: Move ui/events/linux/* to ui/base/ime/linux/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor7_correct_text_edit_command_aura_typo
Patch Set: Rebase. Created 4 years, 6 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
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 #include "ui/views/controls/textfield/textfield.h" 5 #include "ui/views/controls/textfield/textfield.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "ui/views/views_delegate.h" 45 #include "ui/views/views_delegate.h"
46 #include "ui/views/widget/widget.h" 46 #include "ui/views/widget/widget.h"
47 47
48 #if defined(OS_WIN) 48 #if defined(OS_WIN)
49 #include "base/win/win_util.h" 49 #include "base/win/win_util.h"
50 #include "ui/base/win/osk_display_manager.h" 50 #include "ui/base/win/osk_display_manager.h"
51 #endif 51 #endif
52 52
53 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 53 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
54 #include "base/strings/utf_string_conversions.h" 54 #include "base/strings/utf_string_conversions.h"
55 #include "ui/events/linux/text_edit_command_auralinux.h" 55 #include "ui/base/ime/linux/text_edit_command_auralinux.h"
56 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" 56 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
57 #endif 57 #endif
58 58
59 namespace views { 59 namespace views {
60 60
61 namespace { 61 namespace {
62 62
63 // Default placeholder text color. 63 // Default placeholder text color.
64 const SkColor kDefaultPlaceholderTextColor = SK_ColorLTGRAY; 64 const SkColor kDefaultPlaceholderTextColor = SK_ColorLTGRAY;
65 65
66 void ConvertRectToScreen(const View* src, gfx::Rect* r) { 66 void ConvertRectToScreen(const View* src, gfx::Rect* r) {
(...skipping 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1991 RequestFocus(); 1991 RequestFocus();
1992 model_->MoveCursorTo(mouse); 1992 model_->MoveCursorTo(mouse);
1993 if (!selection_clipboard_text.empty()) { 1993 if (!selection_clipboard_text.empty()) {
1994 model_->InsertText(selection_clipboard_text); 1994 model_->InsertText(selection_clipboard_text);
1995 UpdateAfterChange(true, true); 1995 UpdateAfterChange(true, true);
1996 } 1996 }
1997 OnAfterUserAction(); 1997 OnAfterUserAction();
1998 } 1998 }
1999 1999
2000 } // namespace views 2000 } // namespace views
OLDNEW
« no previous file with comments | « ui/events/linux/text_edit_key_bindings_delegate_auralinux.cc ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698