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 #ifndef UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ | 5 #ifndef UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ |
6 #define UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ | 6 #define UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ |
7 | 7 |
8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
9 | 9 |
| 10 #include "base/optional.h" |
10 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
11 #import "ui/base/cocoa/tool_tip_base_view.h" | 12 #import "ui/base/cocoa/tool_tip_base_view.h" |
12 #import "ui/base/cocoa/tracking_area.h" | 13 #import "ui/base/cocoa/tracking_area.h" |
13 | 14 |
14 namespace ui { | 15 namespace ui { |
15 class TextInputClient; | 16 class TextInputClient; |
16 } | 17 } |
17 | 18 |
18 namespace views { | 19 namespace views { |
19 class View; | 20 class View; |
(...skipping 12 matching lines...) Expand all Loading... |
32 // Weak. If non-null the TextInputClient of the currently focused View in the | 33 // Weak. If non-null the TextInputClient of the currently focused View in the |
33 // hierarchy rooted at |hostedView_|. Owned by the focused View. | 34 // hierarchy rooted at |hostedView_|. Owned by the focused View. |
34 ui::TextInputClient* textInputClient_; | 35 ui::TextInputClient* textInputClient_; |
35 | 36 |
36 // A tracking area installed to enable mouseMoved events. | 37 // A tracking area installed to enable mouseMoved events. |
37 ui::ScopedCrTrackingArea cursorTrackingArea_; | 38 ui::ScopedCrTrackingArea cursorTrackingArea_; |
38 | 39 |
39 // The keyDown event currently being handled, nil otherwise. | 40 // The keyDown event currently being handled, nil otherwise. |
40 NSEvent* keyDownEvent_; | 41 NSEvent* keyDownEvent_; |
41 | 42 |
| 43 // The performKeyEquivalent event currently being handled, nil otherwise. |
| 44 NSEvent* performKeyEquivalentEvent_; |
| 45 |
| 46 // Holds non-null result of trying to handle the |performKeyEquivalentEvent_| |
| 47 // using handleKeyEvent:. |
| 48 base::Optional<BOOL> performKeyEquivalentEventHandled_; |
| 49 |
42 // The last tooltip text, used to limit updates. | 50 // The last tooltip text, used to limit updates. |
43 base::string16 lastTooltipText_; | 51 base::string16 lastTooltipText_; |
44 | 52 |
45 // Whether to draw an almost-transparent background with rounded corners so | 53 // Whether to draw an almost-transparent background with rounded corners so |
46 // that OSX correctly blurs the background showing through. | 54 // that OSX correctly blurs the background showing through. |
47 BOOL drawMenuBackgroundForBlur_; | 55 BOOL drawMenuBackgroundForBlur_; |
48 | 56 |
49 // Whether dragging on the view moves the window. | 57 // Whether dragging on the view moves the window. |
50 BOOL mouseDownCanMoveWindow_; | 58 BOOL mouseDownCanMoveWindow_; |
51 | 59 |
(...skipping 28 matching lines...) Expand all Loading... |
80 // Update windowMask_ depending on the current view bounds. | 88 // Update windowMask_ depending on the current view bounds. |
81 - (void)updateWindowMask; | 89 - (void)updateWindowMask; |
82 | 90 |
83 // Notifies the associated FocusManager whether full keyboard access is enabled | 91 // Notifies the associated FocusManager whether full keyboard access is enabled |
84 // or not. | 92 // or not. |
85 - (void)updateFullKeyboardAccess; | 93 - (void)updateFullKeyboardAccess; |
86 | 94 |
87 @end | 95 @end |
88 | 96 |
89 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ | 97 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ |
OLD | NEW |