ash/shelf/shelf_layout_manager.cc - Issue 251343003: Checked validity of status_widget before calling IsActive method.

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/shelf/shelf_layout_manager.cc

Issue 251343003: Checked validity of status_widget before calling IsActive method. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index 789c884c5ce5b495e08ff7cb02dd677495b5d3a1..093d38b74e341fc4f2a9ffb6cee41cffacbc85a3 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -1028,7 +1028,9 @@ ShelfAutoHideState ShelfLayoutManager::CalculateAutoHideState(

if (shelf_->shelf() && shelf_->shelf()->IsShowingOverflowBubble())

return SHELF_AUTO_HIDE_SHOWN;

- if (shelf_->IsActive() || shelf_->status_area_widget()->IsActive())

+ if (shelf_->IsActive() ||

+ (shelf_->status_area_widget() &&

+ shelf_->status_area_widget()->IsActive()))

return SHELF_AUTO_HIDE_SHOWN;

const std::vector<aura::Window*> windows =

« no previous file with comments | « no previous file | no next file » | no next file with comments »