Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: ui/views/cocoa/bridged_content_view.h

Issue 2469213002: MacViews: TouchBar integration for toolkit-views dialogs. (Closed)
Patch Set: nit comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #import "ui/base/cocoa/tool_tip_base_view.h" 11 #import "ui/base/cocoa/tool_tip_base_view.h"
12 #import "ui/base/cocoa/tracking_area.h" 12 #import "ui/base/cocoa/tracking_area.h"
13 13
14 namespace ui { 14 namespace ui {
15 class TextInputClient; 15 class TextInputClient;
16 } 16 }
17 17
18 namespace views { 18 namespace views {
19 class View; 19 class View;
20 } 20 }
21 21
22 #if !defined(MAC_OS_X_VERSION_10_12_1)
23 @protocol NSTouchBarDelegate<NSObject>
24 @end
25 #else
26 @protocol NSTouchBarDelegate;
27 #endif
28
22 // The NSView that sits as the root contentView of the NSWindow, whilst it has 29 // The NSView that sits as the root contentView of the NSWindow, whilst it has
23 // a views::RootView present. Bridges requests from Cocoa to the hosted 30 // a views::RootView present. Bridges requests from Cocoa to the hosted
24 // views::View. 31 // views::View.
25 @interface BridgedContentView : ToolTipBaseView<NSTextInputClient, 32 @interface BridgedContentView : ToolTipBaseView<NSTextInputClient,
26 NSUserInterfaceValidations, 33 NSUserInterfaceValidations,
27 NSDraggingSource> { 34 NSDraggingSource,
35 NSTouchBarDelegate> {
28 @private 36 @private
29 // Weak. The hosted RootView, owned by hostedView_->GetWidget(). 37 // Weak. The hosted RootView, owned by hostedView_->GetWidget().
30 views::View* hostedView_; 38 views::View* hostedView_;
31 39
32 // Weak. If non-null the TextInputClient of the currently focused View in the 40 // Weak. If non-null the TextInputClient of the currently focused View in the
33 // hierarchy rooted at |hostedView_|. Owned by the focused View. 41 // hierarchy rooted at |hostedView_|. Owned by the focused View.
34 ui::TextInputClient* textInputClient_; 42 ui::TextInputClient* textInputClient_;
35 43
36 // A tracking area installed to enable mouseMoved events. 44 // A tracking area installed to enable mouseMoved events.
37 ui::ScopedCrTrackingArea cursorTrackingArea_; 45 ui::ScopedCrTrackingArea cursorTrackingArea_;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_
OLDNEW
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_content_view.mm » ('j') | ui/views/cocoa/bridged_content_view.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698