| 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..6dbdb23bacc5fedb5cb8277910b3c7b06c4bb9ea 100644
|
| --- a/ui/views/cocoa/bridged_content_view.h
|
| +++ b/ui/views/cocoa/bridged_content_view.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include "base/optional.h"
|
| #include "base/strings/string16.h"
|
| #import "ui/base/cocoa/tool_tip_base_view.h"
|
| #import "ui/base/cocoa/tracking_area.h"
|
| @@ -39,6 +40,13 @@ class View;
|
| // The keyDown event currently being handled, nil otherwise.
|
| NSEvent* keyDownEvent_;
|
|
|
| + // The performKeyEquivalent event currently being handled, nil otherwise.
|
| + NSEvent* performKeyEquivalentEvent_;
|
| +
|
| + // Holds non-null result of trying to handle the |performKeyEquivalentEvent_|
|
| + // using handleKeyEvent:.
|
| + base::Optional<BOOL> performKeyEquivalentEventHandled_;
|
| +
|
| // The last tooltip text, used to limit updates.
|
| base::string16 lastTooltipText_;
|
|
|
|
|