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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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, 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:

View unified diff | 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/system/overview/overview_button_tray.h"	5 #include "ash/system/overview/overview_button_tray.h"

6	6

7 #include "ash/shelf/shelf_types.h"	7 #include "ash/shelf/shelf_types.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "ash/system/tray/system_tray_delegate.h"	9 #include "ash/system/tray/system_tray_delegate.h"

10 #include "ash/system/tray/tray_utils.h"	10 #include "ash/system/tray/tray_utils.h"

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 } else {	107 } else {

108 icon_->SetBorder(views::Border::CreateEmptyBorder(	108 icon_->SetBorder(views::Border::CreateEmptyBorder(

109 kVerticalShelfVerticalPadding,	109 kVerticalShelfVerticalPadding,

110 kVerticalShelfHorizontalPadding,	110 kVerticalShelfHorizontalPadding,

111 kVerticalShelfVerticalPadding,	111 kVerticalShelfVerticalPadding,

112 kVerticalShelfHorizontalPadding));	112 kVerticalShelfHorizontalPadding));

113 }	113 }

114 }	114 }

115	115

116 void OverviewButtonTray::UpdateIconVisibility() {	116 void OverviewButtonTray::UpdateIconVisibility() {

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

118 IsMaximizeModeWindowManagerEnabled() &&	118 ->maximize_mode_controller()

119 Shell::GetInstance()->window_selector_controller()->CanSelect());	119 ->IsMaximizeModeWindowManagerEnabled() &&

	120 Shell::GetInstance()

	121 ->window_selector_controller()

	122 ->IsUserInActiveDesktopEnvironment());

120 }	123 }

121	124

122 } // namespace ash	125 } // namespace ash

OLD	NEW