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

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

Issue 250943008: Move enum MenuAnchorPosition to reduce deps on menu_item_view.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 6 years, 7 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) 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 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "grit/ui_strings.h" 10 #include "grit/ui_strings.h"
11 #include "ui/accessibility/ax_view_state.h" 11 #include "ui/accessibility/ax_view_state.h"
12 #include "ui/base/clipboard/scoped_clipboard_writer.h" 12 #include "ui/base/clipboard/scoped_clipboard_writer.h"
13 #include "ui/base/cursor/cursor.h" 13 #include "ui/base/cursor/cursor.h"
14 #include "ui/base/dragdrop/drag_drop_types.h" 14 #include "ui/base/dragdrop/drag_drop_types.h"
15 #include "ui/base/dragdrop/drag_utils.h" 15 #include "ui/base/dragdrop/drag_utils.h"
16 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
17 #include "ui/base/ui_base_switches_util.h" 17 #include "ui/base/ui_base_switches_util.h"
18 #include "ui/events/event.h" 18 #include "ui/events/event.h"
19 #include "ui/events/keycodes/keyboard_codes.h" 19 #include "ui/events/keycodes/keyboard_codes.h"
20 #include "ui/gfx/canvas.h" 20 #include "ui/gfx/canvas.h"
21 #include "ui/gfx/display.h" 21 #include "ui/gfx/display.h"
22 #include "ui/gfx/insets.h" 22 #include "ui/gfx/insets.h"
23 #include "ui/gfx/screen.h" 23 #include "ui/gfx/screen.h"
24 #include "ui/native_theme/native_theme.h" 24 #include "ui/native_theme/native_theme.h"
25 #include "ui/views/background.h" 25 #include "ui/views/background.h"
26 #include "ui/views/controls/focusable_border.h" 26 #include "ui/views/controls/focusable_border.h"
27 #include "ui/views/controls/label.h" 27 #include "ui/views/controls/label.h"
28 #include "ui/views/controls/menu/menu_item_view.h"
29 #include "ui/views/controls/menu/menu_runner.h" 28 #include "ui/views/controls/menu/menu_runner.h"
30 #include "ui/views/controls/native/native_view_host.h" 29 #include "ui/views/controls/native/native_view_host.h"
31 #include "ui/views/controls/textfield/textfield_controller.h" 30 #include "ui/views/controls/textfield/textfield_controller.h"
32 #include "ui/views/drag_utils.h" 31 #include "ui/views/drag_utils.h"
33 #include "ui/views/ime/input_method.h" 32 #include "ui/views/ime/input_method.h"
34 #include "ui/views/metrics.h" 33 #include "ui/views/metrics.h"
35 #include "ui/views/native_cursor.h" 34 #include "ui/views/native_cursor.h"
36 #include "ui/views/painter.h" 35 #include "ui/views/painter.h"
37 #include "ui/views/views_delegate.h" 36 #include "ui/views/views_delegate.h"
38 #include "ui/views/widget/widget.h" 37 #include "ui/views/widget/widget.h"
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 GetInputMethod()->CancelComposition(this); 915 GetInputMethod()->CancelComposition(this);
917 } 916 }
918 917
919 //////////////////////////////////////////////////////////////////////////////// 918 ////////////////////////////////////////////////////////////////////////////////
920 // Textfield, ContextMenuController overrides: 919 // Textfield, ContextMenuController overrides:
921 920
922 void Textfield::ShowContextMenuForView(View* source, 921 void Textfield::ShowContextMenuForView(View* source,
923 const gfx::Point& point, 922 const gfx::Point& point,
924 ui::MenuSourceType source_type) { 923 ui::MenuSourceType source_type) {
925 UpdateContextMenu(); 924 UpdateContextMenu();
926 ignore_result(context_menu_runner_->RunMenuAt(GetWidget(), NULL, 925 ignore_result(context_menu_runner_->RunMenuAt(
927 gfx::Rect(point, gfx::Size()), MenuItemView::TOPLEFT, source_type, 926 GetWidget(),
927 NULL,
928 gfx::Rect(point, gfx::Size()),
929 ui::MENU_ANCHOR_TOPLEFT,
930 source_type,
928 MenuRunner::HAS_MNEMONICS | MenuRunner::CONTEXT_MENU)); 931 MenuRunner::HAS_MNEMONICS | MenuRunner::CONTEXT_MENU));
929 } 932 }
930 933
931 //////////////////////////////////////////////////////////////////////////////// 934 ////////////////////////////////////////////////////////////////////////////////
932 // Textfield, DragController overrides: 935 // Textfield, DragController overrides:
933 936
934 void Textfield::WriteDragDataForView(View* sender, 937 void Textfield::WriteDragDataForView(View* sender,
935 const gfx::Point& press_pt, 938 const gfx::Point& press_pt,
936 OSExchangeData* data) { 939 OSExchangeData* data) {
937 const base::string16& selected_text(GetSelectedText()); 940 const base::string16& selected_text(GetSelectedText());
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 const size_t length = selection_clipboard_text.length(); 1687 const size_t length = selection_clipboard_text.length();
1685 range = gfx::Range(range.start() + length, range.end() + length); 1688 range = gfx::Range(range.start() + length, range.end() + length);
1686 } 1689 }
1687 model_->MoveCursorTo(gfx::SelectionModel(range, affinity)); 1690 model_->MoveCursorTo(gfx::SelectionModel(range, affinity));
1688 UpdateAfterChange(true, true); 1691 UpdateAfterChange(true, true);
1689 OnAfterUserAction(); 1692 OnAfterUserAction();
1690 } 1693 }
1691 } 1694 }
1692 1695
1693 } // namespace views 1696 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698