ash/system/overview/overview_button_tray.cc - Issue 1114383002: Show overview mode button in TouchView with open modal window

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/overview/overview_button_tray.cc

Issue 1114383002: Show overview mode button in TouchView with open modal window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

View side-by-side diff with in-line comments

Download patch

« ash/system/overview/overview_button_tray.h ('K') | « ash/system/overview/overview_button_tray.h ('k') | ash/system/overview/overview_button_tray_unittest.cc » ('j') | ash/system/overview/overview_button_tray_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/overview/overview_button_tray.cc

diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc

index ec2912fa209d008cc62ac4496737993227e6a4e5..c960077d11107a602f18281c5b3657ab9b3a71cd 100644

--- a/ash/system/overview/overview_button_tray.cc

+++ b/ash/system/overview/overview_button_tray.cc

@@ -114,9 +114,12 @@ void OverviewButtonTray::SetIconBorderForShelfAlignment() {

}

void OverviewButtonTray::UpdateIconVisibility() {

- SetVisible(Shell::GetInstance()->maximize_mode_controller()->

- IsMaximizeModeWindowManagerEnabled() &&

- Shell::GetInstance()->window_selector_controller()->CanSelect());

+ SetVisible(Shell::GetInstance()

+ ->maximize_mode_controller()

+ ->IsMaximizeModeWindowManagerEnabled() &&

+ Shell::GetInstance()

+ ->window_selector_controller()

+ ->IsUserInActiveDesktopEnvironment());

}

} // namespace ash