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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 } else { | 108 } else { |
109 icon_->SetBorder(views::Border::CreateEmptyBorder( | 109 icon_->SetBorder(views::Border::CreateEmptyBorder( |
110 kVerticalShelfVerticalPadding, | 110 kVerticalShelfVerticalPadding, |
111 kVerticalShelfHorizontalPadding, | 111 kVerticalShelfHorizontalPadding, |
112 kVerticalShelfVerticalPadding, | 112 kVerticalShelfVerticalPadding, |
113 kVerticalShelfHorizontalPadding)); | 113 kVerticalShelfHorizontalPadding)); |
114 } | 114 } |
115 } | 115 } |
116 | 116 |
117 void OverviewButtonTray::UpdateIconVisibility() { | 117 void OverviewButtonTray::UpdateIconVisibility() { |
118 SetVisible(Shell::GetInstance()->maximize_mode_controller()-> | 118 SetVisible(Shell::GetInstance() |
119 IsMaximizeModeWindowManagerEnabled() && | 119 ->maximize_mode_controller() |
120 Shell::GetInstance()->window_selector_controller()->CanSelect()); | 120 ->IsMaximizeModeWindowManagerEnabled() && |
| 121 Shell::GetInstance() |
| 122 ->window_selector_controller() |
| 123 ->IsUserInActiveDesktopEnvironment()); |
121 } | 124 } |
122 | 125 |
123 } // namespace ash | 126 } // namespace ash |
OLD | NEW |