ui/views/focus/focus_manager.cc - Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/focus/focus_manager.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2

Patch Set: Fix Mac Created 5 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 side-by-side diff with in-line comments

Download patch

Index: ui/views/focus/focus_manager.cc

diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc

index 706b3182721dcafe37b86665445094ac5a4d283a..ed12e4d0956af9e9d09e4ff31c6708adc3b4b37b 100644

--- a/ui/views/focus/focus_manager.cc

+++ b/ui/views/focus/focus_manager.cc

@@ -44,7 +44,6 @@ static inline int CalculateModifiers(const ui::KeyEvent& event) {

} // namespace

-bool FocusManager::shortcut_handling_suspended_ = false;

bool FocusManager::arrow_key_traversal_enabled_ = false;

FocusManager::FocusManager(Widget* widget, FocusManagerDelegate* delegate)

@@ -52,6 +51,7 @@ FocusManager::FocusManager(Widget* widget, FocusManagerDelegate* delegate)

delegate_(delegate),

focused_view_(NULL),

accelerator_manager_(new ui::AcceleratorManager),

+ shortcut_handling_suspended_(false),

focus_change_reason_(kReasonDirectFocusChange),

is_changing_focus_(false) {

DCHECK(widget_);

« no previous file with comments | « ui/views/focus/focus_manager.h ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »