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_native_widget.h" | 5 #import "ui/views/cocoa/bridged_native_widget.h" |
6 | 6 |
7 #import <objc/runtime.h> | 7 #import <objc/runtime.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
11 #import "base/mac/sdk_forward_declarations.h" | 11 #import "base/mac/sdk_forward_declarations.h" |
12 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
13 #include "ui/base/ime/input_method.h" | 13 #include "ui/base/ime/input_method.h" |
14 #include "ui/base/ime/input_method_factory.h" | 14 #include "ui/base/ime/input_method_factory.h" |
15 #include "ui/base/ui_base_switches_util.h" | 15 #include "ui/base/ui_base_switches_util.h" |
16 #include "ui/gfx/display.h" | 16 #include "ui/gfx/display.h" |
17 #include "ui/gfx/geometry/dip_util.h" | 17 #include "ui/gfx/geometry/dip_util.h" |
18 #import "ui/gfx/mac/coordinate_conversion.h" | 18 #import "ui/gfx/mac/coordinate_conversion.h" |
19 #import "ui/gfx/mac/nswindow_frame_controls.h" | 19 #import "ui/gfx/mac/nswindow_frame_controls.h" |
20 #include "ui/gfx/screen.h" | 20 #include "ui/gfx/screen.h" |
| 21 #import "ui/views/cocoa/bridged_content_view.h" |
21 #import "ui/views/cocoa/cocoa_mouse_capture.h" | 22 #import "ui/views/cocoa/cocoa_mouse_capture.h" |
22 #import "ui/views/cocoa/bridged_content_view.h" | |
23 #include "ui/views/cocoa/tooltip_manager_mac.h" | 23 #include "ui/views/cocoa/tooltip_manager_mac.h" |
24 #import "ui/views/cocoa/views_nswindow_delegate.h" | 24 #import "ui/views/cocoa/views_nswindow_delegate.h" |
25 #import "ui/views/cocoa/widget_owner_nswindow_adapter.h" | 25 #import "ui/views/cocoa/widget_owner_nswindow_adapter.h" |
26 #include "ui/views/widget/native_widget_mac.h" | |
27 #include "ui/views/ime/input_method_bridge.h" | 26 #include "ui/views/ime/input_method_bridge.h" |
28 #include "ui/views/ime/null_input_method.h" | 27 #include "ui/views/ime/null_input_method.h" |
29 #include "ui/views/view.h" | 28 #include "ui/views/view.h" |
30 #include "ui/views/views_delegate.h" | 29 #include "ui/views/views_delegate.h" |
| 30 #include "ui/views/widget/native_widget_mac.h" |
31 #include "ui/views/widget/widget.h" | 31 #include "ui/views/widget/widget.h" |
32 #include "ui/views/widget/widget_aura_utils.h" | 32 #include "ui/views/widget/widget_aura_utils.h" |
33 #include "ui/views/widget/widget_delegate.h" | 33 #include "ui/views/widget/widget_delegate.h" |
34 | 34 |
35 // The NSView that hosts the composited CALayer drawing the UI. It fills the | 35 // The NSView that hosts the composited CALayer drawing the UI. It fills the |
36 // window but is not hittable so that accessibility hit tests always go to the | 36 // window but is not hittable so that accessibility hit tests always go to the |
37 // BridgedContentView. | 37 // BridgedContentView. |
38 @interface ViewsCompositorSuperview : NSView | 38 @interface ViewsCompositorSuperview : NSView |
39 @end | 39 @end |
40 | 40 |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 window_, &kWindowPropertiesKey); | 855 window_, &kWindowPropertiesKey); |
856 if (!properties) { | 856 if (!properties) { |
857 properties = [NSMutableDictionary dictionary]; | 857 properties = [NSMutableDictionary dictionary]; |
858 objc_setAssociatedObject(window_, &kWindowPropertiesKey, | 858 objc_setAssociatedObject(window_, &kWindowPropertiesKey, |
859 properties, OBJC_ASSOCIATION_RETAIN); | 859 properties, OBJC_ASSOCIATION_RETAIN); |
860 } | 860 } |
861 return properties; | 861 return properties; |
862 } | 862 } |
863 | 863 |
864 } // namespace views | 864 } // namespace views |
OLD | NEW |