Chromium Code Reviews| 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/mac_util.h" | 8 #import "base/mac/mac_util.h" |
| 9 #import "base/mac/scoped_nsobject.h" | 9 #import "base/mac/scoped_nsobject.h" |
| 10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| 11 #include "skia/ext/skia_utils_mac.h" | 11 #include "skia/ext/skia_utils_mac.h" |
| 12 #include "ui/base/cocoa/cocoa_base_utils.h" | 12 #include "ui/base/cocoa/cocoa_base_utils.h" |
| 13 #include "ui/base/dragdrop/drag_drop_types.h" | 13 #include "ui/base/dragdrop/drag_drop_types.h" |
| 14 #include "ui/base/dragdrop/os_exchange_data_provider_mac.h" | 14 #include "ui/base/dragdrop/os_exchange_data_provider_mac.h" |
| 15 #include "ui/base/ime/input_method.h" | 15 #include "ui/base/ime/input_method.h" |
| 16 #include "ui/base/ime/text_edit_commands.h" | 16 #include "ui/base/ime/text_edit_commands.h" |
| 17 #include "ui/base/ime/text_input_client.h" | 17 #include "ui/base/ime/text_input_client.h" |
| 18 #include "ui/compositor/canvas_painter.h" | 18 #include "ui/compositor/canvas_painter.h" |
| 19 #import "ui/events/cocoa/cocoa_event_utils.h" | 19 #import "ui/events/cocoa/cocoa_event_utils.h" |
| 20 #include "ui/events/keycodes/dom/dom_code.h" | 20 #include "ui/events/keycodes/dom/dom_code.h" |
| 21 #import "ui/events/keycodes/keyboard_code_conversion_mac.h" | 21 #import "ui/events/keycodes/keyboard_code_conversion_mac.h" |
| 22 #include "ui/gfx/canvas_paint_mac.h" | 22 #include "ui/gfx/canvas_paint_mac.h" |
| 23 #include "ui/gfx/geometry/rect.h" | 23 #include "ui/gfx/geometry/rect.h" |
| 24 #import "ui/gfx/mac/coordinate_conversion.h" | 24 #import "ui/gfx/mac/coordinate_conversion.h" |
| 25 #include "ui/gfx/path.h" | 25 #include "ui/gfx/path.h" |
| 26 #import "ui/gfx/path_mac.h" | 26 #import "ui/gfx/path_mac.h" |
| 27 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 27 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
| 28 #include "ui/views/accessibility/native_view_accessibility.h" | |
|
tapted
2016/10/04 08:17:39
nit: this might not be required now
Patti Lor
2016/10/05 05:47:23
Done.
| |
| 28 #import "ui/views/cocoa/bridged_native_widget.h" | 29 #import "ui/views/cocoa/bridged_native_widget.h" |
| 29 #import "ui/views/cocoa/drag_drop_client_mac.h" | 30 #import "ui/views/cocoa/drag_drop_client_mac.h" |
| 30 #include "ui/views/controls/menu/menu_config.h" | 31 #include "ui/views/controls/menu/menu_config.h" |
| 31 #include "ui/views/controls/menu/menu_controller.h" | 32 #include "ui/views/controls/menu/menu_controller.h" |
| 32 #include "ui/views/view.h" | 33 #include "ui/views/view.h" |
| 33 #include "ui/views/widget/native_widget_mac.h" | 34 #include "ui/views/widget/native_widget_mac.h" |
| 34 #include "ui/views/widget/widget.h" | 35 #include "ui/views/widget/widget.h" |
| 35 | 36 |
| 36 using views::MenuController; | 37 using views::MenuController; |
| 37 | 38 |
| (...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1355 return @[ hostedView_->GetNativeViewAccessible() ]; | 1356 return @[ hostedView_->GetNativeViewAccessible() ]; |
| 1356 } | 1357 } |
| 1357 | 1358 |
| 1358 return [super accessibilityAttributeValue:attribute]; | 1359 return [super accessibilityAttributeValue:attribute]; |
| 1359 } | 1360 } |
| 1360 | 1361 |
| 1361 - (id)accessibilityHitTest:(NSPoint)point { | 1362 - (id)accessibilityHitTest:(NSPoint)point { |
| 1362 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point]; | 1363 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point]; |
| 1363 } | 1364 } |
| 1364 | 1365 |
| 1366 - (id)accessibilityFocusedUIElement { | |
| 1367 if (!hostedView_) | |
| 1368 return nil; | |
| 1369 return [hostedView_->GetNativeViewAccessible() accessibilityFocusedUIElement]; | |
| 1370 } | |
| 1371 | |
| 1365 @end | 1372 @end |
| OLD | NEW |