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

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

Issue 6628037: views: Moves TextfieldController/TextRange into their own headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a typo Created 9 years, 9 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 #include "views/controls/textfield/native_textfield_win.h" 5 #include "views/controls/textfield/native_textfield_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/win/windows_version.h" 12 #include "base/win/windows_version.h"
13 #include "grit/app_strings.h" 13 #include "grit/app_strings.h"
14 #include "skia/ext/skia_utils_win.h" 14 #include "skia/ext/skia_utils_win.h"
15 #include "ui/base/clipboard/clipboard.h" 15 #include "ui/base/clipboard/clipboard.h"
16 #include "ui/base/clipboard/scoped_clipboard_writer.h" 16 #include "ui/base/clipboard/scoped_clipboard_writer.h"
17 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
17 #include "ui/base/keycodes/keyboard_codes.h" 18 #include "ui/base/keycodes/keyboard_codes.h"
18 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/l10n/l10n_util_win.h" 20 #include "ui/base/l10n/l10n_util_win.h"
21 #include "ui/gfx/native_theme_win.h" 21 #include "ui/gfx/native_theme_win.h"
22 #include "views/controls/label.h" 22 #include "views/controls/label.h"
23 #include "views/controls/menu/menu_2.h"
23 #include "views/controls/menu/menu_win.h" 24 #include "views/controls/menu/menu_win.h"
24 #include "views/controls/menu/menu_2.h"
25 #include "views/controls/native/native_view_host.h" 25 #include "views/controls/native/native_view_host.h"
26 #include "views/controls/textfield/native_textfield_views.h" 26 #include "views/controls/textfield/native_textfield_views.h"
27 #include "views/controls/textfield/text_range.h"
27 #include "views/controls/textfield/textfield.h" 28 #include "views/controls/textfield/textfield.h"
29 #include "views/controls/textfield/textfield_controller.h"
28 #include "views/focus/focus_manager.h" 30 #include "views/focus/focus_manager.h"
29 #include "views/focus/focus_util_win.h" 31 #include "views/focus/focus_util_win.h"
30 #include "views/metrics.h" 32 #include "views/metrics.h"
31 #include "views/views_delegate.h" 33 #include "views/views_delegate.h"
32 #include "views/widget/widget.h" 34 #include "views/widget/widget.h"
33 35
34 namespace views { 36 namespace views {
35 37
36 /////////////////////////////////////////////////////////////////////////////// 38 ///////////////////////////////////////////////////////////////////////////////
37 // Helper classes 39 // Helper classes
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 // WM_SYSCOMMAND to open the application context menu, so we need to allow 928 // WM_SYSCOMMAND to open the application context menu, so we need to allow
927 // it through. 929 // it through.
928 if (ch == VK_SPACE) 930 if (ch == VK_SPACE)
929 SetMsgHandled(false); 931 SetMsgHandled(false);
930 } 932 }
931 933
932 void NativeTextfieldWin::HandleKeystroke() { 934 void NativeTextfieldWin::HandleKeystroke() {
933 const MSG* msg = GetCurrentMessage(); 935 const MSG* msg = GetCurrentMessage();
934 ScopedFreeze freeze(this, GetTextObjectModel()); 936 ScopedFreeze freeze(this, GetTextObjectModel());
935 937
936 Textfield::Controller* controller = textfield_->GetController(); 938 TextfieldController* controller = textfield_->GetController();
937 bool handled = false; 939 bool handled = false;
938 if (controller) { 940 if (controller) {
939 KeyEvent event(*msg); 941 KeyEvent event(*msg);
940 handled = controller->HandleKeyEvent(textfield_, event); 942 handled = controller->HandleKeyEvent(textfield_, event);
941 } 943 }
942 944
943 if (!handled) { 945 if (!handled) {
944 OnBeforePossibleChange(); 946 OnBeforePossibleChange();
945 947
946 if (msg->wParam == ui::VKEY_HOME || msg->wParam == ui::VKEY_END) { 948 if (msg->wParam == ui::VKEY_HOME || msg->wParam == ui::VKEY_END) {
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper( 1138 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
1137 Textfield* field) { 1139 Textfield* field) {
1138 if (NativeTextfieldViews::IsTextfieldViewsEnabled()) { 1140 if (NativeTextfieldViews::IsTextfieldViewsEnabled()) {
1139 return new NativeTextfieldViews(field); 1141 return new NativeTextfieldViews(field);
1140 } else { 1142 } else {
1141 return new NativeTextfieldWin(field); 1143 return new NativeTextfieldWin(field);
1142 } 1144 }
1143 } 1145 }
1144 1146
1145 } // namespace views 1147 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698