New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: window menu should handle keys correctly #21434
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Cheng Zhao <zcbenz@gmail.com> | ||
Date: Thu, 4 Oct 2018 14:57:02 -0700 | ||
Subject: fix: add back virtual methods in AccessiblePaneView | ||
|
||
Mark SetPaneFocus and RemovePaneFocus as virtual in AccessiblePaneView, as we | ||
need to override them in MenuBar. | ||
|
||
diff --git a/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h | ||
index 813fd13860a8..990c905e8f19 100644 | ||
--- a/ui/views/accessible_pane_view.h | ||
+++ b/ui/views/accessible_pane_view.h | ||
@@ -35,7 +35,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View, | ||
// If |initial_focus| is not NULL, that control will get | ||
// the initial focus, if it's enabled and focusable. Returns true if | ||
// the pane was able to receive focus. | ||
- bool SetPaneFocus(View* initial_focus); | ||
+ virtual bool SetPaneFocus(View* initial_focus); | ||
|
||
bool pane_has_focus() const { return pane_has_focus_; } | ||
|
||
@@ -83,7 +83,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View, | ||
bool ContainsForFocusSearch(View* root, const View* v); | ||
|
||
// Remove pane focus. | ||
- void RemovePaneFocus(); | ||
+ virtual void RemovePaneFocus(); | ||
|
||
View* GetFirstFocusableChild(); | ||
View* GetLastFocusableChild(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you open the CL to chromium and add that CL to this patch so that we can more easily follow/track this patch to ensure it's deleted in future?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Submitted https://crrev.com/c/1959189.