ash/system/tray/system_tray_widget_delegate.cc - Issue 10383234: views: Do not set capture on a widget if it cannot be activated.

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: ash/system/tray/system_tray_widget_delegate.cc

Issue 10383234: views: Do not set capture on a widget if it cannot be activated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: self-nit Created 8 years, 7 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:

Index: ash/system/tray/system_tray_widget_delegate.cc

diff --git a/ash/system/tray/system_tray_widget_delegate.cc b/ash/system/tray/system_tray_widget_delegate.cc

index acc937a90a41635c74d82764af2a79e6cd69d18a..1380a8bc77faab579caf0fb9c61ee7a8b1c06dbb 100644

--- a/ash/system/tray/system_tray_widget_delegate.cc

+++ b/ash/system/tray/system_tray_widget_delegate.cc

@@ -59,7 +59,7 @@ bool StatusAreaView::CanActivate() const {

// activation when the user is using the keyboard (FocusCycler).

const FocusCycler* focus_cycler = focus_cycler_for_testing_ ?

focus_cycler_for_testing_ : Shell::GetInstance()->focus_cycler();

- return focus_cycler->widget_activating() == GetWidget();

+ return focus_cycler && focus_cycler->widget_activating() == GetWidget();

}

void StatusAreaView::DeleteDelegate() {

« no previous file with comments | « ash/system/network/tray_network.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »