| Index: ui/views/cocoa/bridged_content_view.h
|
| diff --git a/ui/views/cocoa/bridged_content_view.h b/ui/views/cocoa/bridged_content_view.h
|
| index f6952a25e80dd9c7a712cc9e24458632e715e6c1..be08d9e08049b6588ed13efac83518b3f43b21dc 100644
|
| --- a/ui/views/cocoa/bridged_content_view.h
|
| +++ b/ui/views/cocoa/bridged_content_view.h
|
| @@ -19,12 +19,20 @@ namespace views {
|
| class View;
|
| }
|
|
|
| +#if !defined(MAC_OS_X_VERSION_10_12_1)
|
| +@protocol NSTouchBarDelegate<NSObject>
|
| +@end
|
| +#else
|
| +@protocol NSTouchBarDelegate;
|
| +#endif
|
| +
|
| // The NSView that sits as the root contentView of the NSWindow, whilst it has
|
| // a views::RootView present. Bridges requests from Cocoa to the hosted
|
| // views::View.
|
| @interface BridgedContentView : ToolTipBaseView<NSTextInputClient,
|
| NSUserInterfaceValidations,
|
| - NSDraggingSource> {
|
| + NSDraggingSource,
|
| + NSTouchBarDelegate> {
|
| @private
|
| // Weak. The hosted RootView, owned by hostedView_->GetWidget().
|
| views::View* hostedView_;
|
|
|