OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #import "ui/views/cocoa/bridged_content_view.h" | 5 #import "ui/views/cocoa/bridged_content_view.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #import "base/mac/scoped_nsobject.h" | 8 #import "base/mac/scoped_nsobject.h" |
9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
| 10 #include "ui/base/ime/input_method.h" |
10 #include "ui/base/ime/text_input_client.h" | 11 #include "ui/base/ime/text_input_client.h" |
11 #include "ui/compositor/canvas_painter.h" | 12 #include "ui/compositor/canvas_painter.h" |
12 #import "ui/events/cocoa/cocoa_event_utils.h" | 13 #import "ui/events/cocoa/cocoa_event_utils.h" |
13 #include "ui/events/keycodes/dom/dom_code.h" | 14 #include "ui/events/keycodes/dom/dom_code.h" |
14 #import "ui/events/keycodes/keyboard_code_conversion_mac.h" | 15 #import "ui/events/keycodes/keyboard_code_conversion_mac.h" |
15 #include "ui/gfx/canvas_paint_mac.h" | 16 #include "ui/gfx/canvas_paint_mac.h" |
16 #include "ui/gfx/geometry/rect.h" | 17 #include "ui/gfx/geometry/rect.h" |
17 #include "ui/strings/grit/ui_strings.h" | 18 #include "ui/strings/grit/ui_strings.h" |
18 #include "ui/views/controls/menu/menu_controller.h" | 19 #include "ui/views/controls/menu/menu_controller.h" |
19 #include "ui/views/ime/input_method.h" | |
20 #include "ui/views/view.h" | 20 #include "ui/views/view.h" |
21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
22 | 22 |
23 using views::MenuController; | 23 using views::MenuController; |
24 | 24 |
25 namespace { | 25 namespace { |
26 | 26 |
27 // Convert a |point| in |source_window|'s AppKit coordinate system (origin at | 27 // Convert a |point| in |source_window|'s AppKit coordinate system (origin at |
28 // the bottom left of the window) to |target_window|'s content rect, with the | 28 // the bottom left of the window) to |target_window|'s content rect, with the |
29 // origin at the top left of the content area. | 29 // origin at the top left of the content area. |
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
707 } | 707 } |
708 | 708 |
709 return [super accessibilityAttributeValue:attribute]; | 709 return [super accessibilityAttributeValue:attribute]; |
710 } | 710 } |
711 | 711 |
712 - (id)accessibilityHitTest:(NSPoint)point { | 712 - (id)accessibilityHitTest:(NSPoint)point { |
713 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point]; | 713 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point]; |
714 } | 714 } |
715 | 715 |
716 @end | 716 @end |
OLD | NEW |