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/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
8 #include "ash/common/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_delegate.h" |
9 #include "ash/common/shelf/shelf_constants.h" | 9 #include "ash/common/shelf/shelf_constants.h" |
10 #include "ash/common/shelf/shelf_types.h" | 10 #include "ash/common/shelf/shelf_types.h" |
11 #include "ash/common/shelf/wm_shelf_util.h" | 11 #include "ash/common/shelf/wm_shelf_util.h" |
12 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
13 #include "ash/common/system/tray/tray_utils.h" | 13 #include "ash/common/system/tray/tray_utils.h" |
14 #include "ash/common/wm/overview/window_selector_controller.h" | 14 #include "ash/common/wm/overview/window_selector_controller.h" |
15 #include "ash/common/wm_shell.h" | 15 #include "ash/common/wm_shell.h" |
16 #include "ash/shelf/shelf_util.h" | |
17 #include "ash/shell.h" | 16 #include "ash/shell.h" |
18 #include "ash/system/status_area_widget.h" | 17 #include "ash/system/status_area_widget.h" |
19 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 18 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
20 #include "grit/ash_resources.h" | 19 #include "grit/ash_resources.h" |
21 #include "grit/ash_strings.h" | 20 #include "grit/ash_strings.h" |
22 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
23 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
24 #include "ui/gfx/paint_vector_icon.h" | 23 #include "ui/gfx/paint_vector_icon.h" |
25 #include "ui/gfx/vector_icons_public.h" | 24 #include "ui/gfx/vector_icons_public.h" |
26 #include "ui/views/border.h" | 25 #include "ui/views/border.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && | 139 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && |
141 session_state_delegate->IsActiveUserSessionStarted() && | 140 session_state_delegate->IsActiveUserSessionStarted() && |
142 !session_state_delegate->IsScreenLocked() && | 141 !session_state_delegate->IsScreenLocked() && |
143 session_state_delegate->GetSessionState() == | 142 session_state_delegate->GetSessionState() == |
144 SessionStateDelegate::SESSION_STATE_ACTIVE && | 143 SessionStateDelegate::SESSION_STATE_ACTIVE && |
145 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() != | 144 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() != |
146 LoginStatus::KIOSK_APP); | 145 LoginStatus::KIOSK_APP); |
147 } | 146 } |
148 | 147 |
149 } // namespace ash | 148 } // namespace ash |
OLD | NEW |