| 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/strings/string16.h" | 10 #include "base/strings/string16.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 // Whether to draw an almost-transparent background with rounded corners so | 45 // Whether to draw an almost-transparent background with rounded corners so |
| 46 // that OSX correctly blurs the background showing through. | 46 // that OSX correctly blurs the background showing through. |
| 47 BOOL drawMenuBackgroundForBlur_; | 47 BOOL drawMenuBackgroundForBlur_; |
| 48 | 48 |
| 49 // Whether dragging on the view moves the window. | 49 // Whether dragging on the view moves the window. |
| 50 BOOL mouseDownCanMoveWindow_; | 50 BOOL mouseDownCanMoveWindow_; |
| 51 | 51 |
| 52 // The cached window mask. Only used for non-rectangular windows on 10.9. | 52 // The cached window mask. Only used for non-rectangular windows on 10.9. |
| 53 base::scoped_nsobject<NSBezierPath> windowMask_; | 53 base::scoped_nsobject<NSBezierPath> windowMask_; |
| 54 |
| 55 base::scoped_nsobject<NSText> textBridge_; |
| 54 } | 56 } |
| 55 | 57 |
| 56 @property(readonly, nonatomic) views::View* hostedView; | 58 @property(readonly, nonatomic) views::View* hostedView; |
| 57 @property(assign, nonatomic) ui::TextInputClient* textInputClient; | 59 @property(assign, nonatomic) ui::TextInputClient* textInputClient; |
| 58 @property(assign, nonatomic) BOOL drawMenuBackgroundForBlur; | 60 @property(assign, nonatomic) BOOL drawMenuBackgroundForBlur; |
| 59 | 61 |
| 60 // Extends an atomic, readonly property on NSView to make it assignable. | 62 // Extends an atomic, readonly property on NSView to make it assignable. |
| 61 // This usually returns YES if the view is transparent. We want to control it | 63 // This usually returns YES if the view is transparent. We want to control it |
| 62 // so that BridgedNativeWidget can dynamically enable dragging of the window. | 64 // so that BridgedNativeWidget can dynamically enable dragging of the window. |
| 63 @property(assign) BOOL mouseDownCanMoveWindow; | 65 @property(assign) BOOL mouseDownCanMoveWindow; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 77 // contentRect (also this NSView's frame), as given by a ui::LocatedEvent. | 79 // contentRect (also this NSView's frame), as given by a ui::LocatedEvent. |
| 78 - (void)updateTooltipIfRequiredAt:(const gfx::Point&)locationInContent; | 80 - (void)updateTooltipIfRequiredAt:(const gfx::Point&)locationInContent; |
| 79 | 81 |
| 80 // Update windowMask_ depending on the current view bounds. | 82 // Update windowMask_ depending on the current view bounds. |
| 81 - (void)updateWindowMask; | 83 - (void)updateWindowMask; |
| 82 | 84 |
| 83 // Notifies the associated FocusManager whether full keyboard access is enabled | 85 // Notifies the associated FocusManager whether full keyboard access is enabled |
| 84 // or not. | 86 // or not. |
| 85 - (void)updateFullKeyboardAccess; | 87 - (void)updateFullKeyboardAccess; |
| 86 | 88 |
| 89 - (NSView*)contextMenuView; |
| 90 |
| 87 @end | 91 @end |
| 88 | 92 |
| 89 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ | 93 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ |
| OLD | NEW |