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

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

Issue 2624093002: MacViews: Correctly handle character events when there's an active TextInputClient. (Closed)
Patch Set: Flip isKeyDownEventHandled_ -> hasUnhandledKeyDownEvent_ Created 3 years, 11 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
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_content_view.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 21 matching lines...) Expand all
32 // Weak. If non-null the TextInputClient of the currently focused View in the 32 // Weak. If non-null the TextInputClient of the currently focused View in the
33 // hierarchy rooted at |hostedView_|. Owned by the focused View. 33 // hierarchy rooted at |hostedView_|. Owned by the focused View.
34 ui::TextInputClient* textInputClient_; 34 ui::TextInputClient* textInputClient_;
35 35
36 // A tracking area installed to enable mouseMoved events. 36 // A tracking area installed to enable mouseMoved events.
37 ui::ScopedCrTrackingArea cursorTrackingArea_; 37 ui::ScopedCrTrackingArea cursorTrackingArea_;
38 38
39 // The keyDown event currently being handled, nil otherwise. 39 // The keyDown event currently being handled, nil otherwise.
40 NSEvent* keyDownEvent_; 40 NSEvent* keyDownEvent_;
41 41
42 // Whether there's an active key down event which is not handled yet.
43 BOOL hasUnhandledKeyDownEvent_;
44
42 // The last tooltip text, used to limit updates. 45 // The last tooltip text, used to limit updates.
43 base::string16 lastTooltipText_; 46 base::string16 lastTooltipText_;
44 47
45 // Whether to draw an almost-transparent background with rounded corners so 48 // Whether to draw an almost-transparent background with rounded corners so
46 // that OSX correctly blurs the background showing through. 49 // that OSX correctly blurs the background showing through.
47 BOOL drawMenuBackgroundForBlur_; 50 BOOL drawMenuBackgroundForBlur_;
48 51
49 // Whether dragging on the view moves the window. 52 // Whether dragging on the view moves the window.
50 BOOL mouseDownCanMoveWindow_; 53 BOOL mouseDownCanMoveWindow_;
51 54
(...skipping 28 matching lines...) Expand all
80 // Update windowMask_ depending on the current view bounds. 83 // Update windowMask_ depending on the current view bounds.
81 - (void)updateWindowMask; 84 - (void)updateWindowMask;
82 85
83 // Notifies the associated FocusManager whether full keyboard access is enabled 86 // Notifies the associated FocusManager whether full keyboard access is enabled
84 // or not. 87 // or not.
85 - (void)updateFullKeyboardAccess; 88 - (void)updateFullKeyboardAccess;
86 89
87 @end 90 @end
88 91
89 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ 92 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698