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

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

Issue 1747803003: MacViews: Implement Tab Dragging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Extract DragsWindowUsingCocoaMoveLoop test, cleanup code. Created 4 years, 9 months 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
21 // User data supplied in kCGEventSourceUserData for an event that should be
22 // ignored.
23 enum { kIgnoreEventUserData = 1 };
24
20 } 25 }
21 26
22 // The NSView that sits as the root contentView of the NSWindow, whilst it has 27 // 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 28 // a views::RootView present. Bridges requests from Cocoa to the hosted
24 // views::View. 29 // views::View.
25 @interface BridgedContentView 30 @interface BridgedContentView
26 : ToolTipBaseView<NSTextInputClient, NSUserInterfaceValidations> { 31 : ToolTipBaseView<NSTextInputClient, NSUserInterfaceValidations> {
27 @private 32 @private
28 // Weak. The hosted RootView, owned by hostedView_->GetWidget(). 33 // Weak. The hosted RootView, owned by hostedView_->GetWidget().
29 views::View* hostedView_; 34 views::View* hostedView_;
30 35
31 // Weak. If non-null the TextInputClient of the currently focused View in the 36 // Weak. If non-null the TextInputClient of the currently focused View in the
32 // hierarchy rooted at |hostedView_|. Owned by the focused View. 37 // hierarchy rooted at |hostedView_|. Owned by the focused View.
33 ui::TextInputClient* textInputClient_; 38 ui::TextInputClient* textInputClient_;
34 39
35 // A tracking area installed to enable mouseMoved events. 40 // A tracking area installed to enable mouseMoved events.
36 ui::ScopedCrTrackingArea cursorTrackingArea_; 41 ui::ScopedCrTrackingArea cursorTrackingArea_;
37 42
38 // Whether the view is reacting to a keyDown event on the view. 43 // Whether the view is reacting to a keyDown event on the view.
39 BOOL inKeyDown_; 44 BOOL inKeyDown_;
40 45
46 BOOL ignoreMouseEvents_;
tapted 2016/03/10 11:51:19 needs a comment
themblsha 2016/03/25 17:22:54 Done. This local instance property wasn't used at
47
41 // The last tooltip text, used to limit updates. 48 // The last tooltip text, used to limit updates.
42 base::string16 lastTooltipText_; 49 base::string16 lastTooltipText_;
43 50
44 // Whether to draw an almost-transparent background with rounded corners so 51 // Whether to draw an almost-transparent background with rounded corners so
45 // that OSX correctly blurs the background showing through. 52 // that OSX correctly blurs the background showing through.
46 BOOL drawMenuBackgroundForBlur_; 53 BOOL drawMenuBackgroundForBlur_;
47 54
48 // Whether dragging on the view moves the window. 55 // Whether dragging on the view moves the window.
49 BOOL mouseDownCanMoveWindow_; 56 BOOL mouseDownCanMoveWindow_;
50 57
51 // The cached window mask. Only used for non-rectangular windows on 10.9. 58 // The cached window mask. Only used for non-rectangular windows on 10.9.
52 base::scoped_nsobject<NSBezierPath> windowMask_; 59 base::scoped_nsobject<NSBezierPath> windowMask_;
53 } 60 }
54 61
55 @property(readonly, nonatomic) views::View* hostedView; 62 @property(readonly, nonatomic) views::View* hostedView;
56 @property(assign, nonatomic) ui::TextInputClient* textInputClient; 63 @property(assign, nonatomic) ui::TextInputClient* textInputClient;
64 @property(assign, nonatomic) BOOL ignoreMouseEvents;
57 @property(assign, nonatomic) BOOL drawMenuBackgroundForBlur; 65 @property(assign, nonatomic) BOOL drawMenuBackgroundForBlur;
58 66
59 // Extends an atomic, readonly property on NSView to make it assignable. 67 // Extends an atomic, readonly property on NSView to make it assignable.
60 // This usually returns YES if the view is transparent. We want to control it 68 // This usually returns YES if the view is transparent. We want to control it
61 // so that BridgedNativeWidget can dynamically enable dragging of the window. 69 // so that BridgedNativeWidget can dynamically enable dragging of the window.
62 @property(assign) BOOL mouseDownCanMoveWindow; 70 @property(assign) BOOL mouseDownCanMoveWindow;
63 71
64 // Initialize the NSView -> views::View bridge. |viewToHost| must be non-NULL. 72 // Initialize the NSView -> views::View bridge. |viewToHost| must be non-NULL.
65 - (id)initWithView:(views::View*)viewToHost; 73 - (id)initWithView:(views::View*)viewToHost;
66 74
67 // Clear the hosted view. For example, if it is about to be destroyed. 75 // Clear the hosted view. For example, if it is about to be destroyed.
68 - (void)clearView; 76 - (void)clearView;
69 77
70 // Process a mouse event captured while the widget had global mouse capture. 78 // Process a mouse event captured while the widget had global mouse capture.
71 - (void)processCapturedMouseEvent:(NSEvent*)theEvent; 79 - (void)processCapturedMouseEvent:(NSEvent*)theEvent;
72 80
73 // Mac's version of views::corewm::TooltipController::UpdateIfRequired(). 81 // Mac's version of views::corewm::TooltipController::UpdateIfRequired().
74 // Updates the tooltip on the ToolTipBaseView if the text needs to change. 82 // Updates the tooltip on the ToolTipBaseView if the text needs to change.
75 // |locationInContent| is the position from the top left of the window's 83 // |locationInContent| is the position from the top left of the window's
76 // contentRect (also this NSView's frame), as given by a ui::LocatedEvent. 84 // contentRect (also this NSView's frame), as given by a ui::LocatedEvent.
77 - (void)updateTooltipIfRequiredAt:(const gfx::Point&)locationInContent; 85 - (void)updateTooltipIfRequiredAt:(const gfx::Point&)locationInContent;
78 86
79 // Update windowMask_ depending on the current view bounds. 87 // Update windowMask_ depending on the current view bounds.
80 - (void)updateWindowMask; 88 - (void)updateWindowMask;
81 89
82 @end 90 @end
83 91
84 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ 92 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698