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/session/session_state_delegate.h" | 7 #include "ash/session/session_state_delegate.h" |
8 #include "ash/shelf/shelf_types.h" | 8 #include "ash/shelf/shelf_types.h" |
9 #include "ash/shelf/shelf_util.h" | 9 #include "ash/shelf/shelf_util.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 | 92 |
93 base::string16 OverviewButtonTray::GetAccessibleNameForTray() { | 93 base::string16 OverviewButtonTray::GetAccessibleNameForTray() { |
94 return l10n_util::GetStringUTF16(IDS_ASH_OVERVIEW_BUTTON_ACCESSIBLE_NAME); | 94 return l10n_util::GetStringUTF16(IDS_ASH_OVERVIEW_BUTTON_ACCESSIBLE_NAME); |
95 } | 95 } |
96 | 96 |
97 void OverviewButtonTray::HideBubbleWithView( | 97 void OverviewButtonTray::HideBubbleWithView( |
98 const views::TrayBubbleView* bubble_view) { | 98 const views::TrayBubbleView* bubble_view) { |
99 // This class has no bubbles to hide. | 99 // This class has no bubbles to hide. |
100 } | 100 } |
101 | 101 |
102 void OverviewButtonTray::SetShelfAlignment(ShelfAlignment alignment) { | 102 void OverviewButtonTray::SetShelfAlignment(wm::ShelfAlignment alignment) { |
103 if (alignment == shelf_alignment()) | 103 if (alignment == shelf_alignment()) |
104 return; | 104 return; |
105 | 105 |
106 TrayBackgroundView::SetShelfAlignment(alignment); | 106 TrayBackgroundView::SetShelfAlignment(alignment); |
107 SetIconBorderForShelfAlignment(); | 107 SetIconBorderForShelfAlignment(); |
108 } | 108 } |
109 | 109 |
110 void OverviewButtonTray::SetIconBorderForShelfAlignment() { | 110 void OverviewButtonTray::SetIconBorderForShelfAlignment() { |
111 if (IsHorizontalAlignment(shelf_alignment())) { | 111 if (IsHorizontalAlignment(shelf_alignment())) { |
112 icon_->SetBorder(views::Border::CreateEmptyBorder( | 112 icon_->SetBorder(views::Border::CreateEmptyBorder( |
(...skipping 23 matching lines...) Expand all Loading... |
136 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && | 136 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && |
137 session_state_delegate->IsActiveUserSessionStarted() && | 137 session_state_delegate->IsActiveUserSessionStarted() && |
138 !session_state_delegate->IsScreenLocked() && | 138 !session_state_delegate->IsScreenLocked() && |
139 session_state_delegate->GetSessionState() == | 139 session_state_delegate->GetSessionState() == |
140 SessionStateDelegate::SESSION_STATE_ACTIVE && | 140 SessionStateDelegate::SESSION_STATE_ACTIVE && |
141 shell->system_tray_delegate()->GetUserLoginStatus() != | 141 shell->system_tray_delegate()->GetUserLoginStatus() != |
142 user::LOGGED_IN_KIOSK_APP); | 142 user::LOGGED_IN_KIOSK_APP); |
143 } | 143 } |
144 | 144 |
145 } // namespace ash | 145 } // namespace ash |
OLD | NEW |