OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/common/system/chromeos/palette/palette_tray.h" | 5 #include "ash/common/system/chromeos/palette/palette_tray.h" |
6 | 6 |
7 #include "ash/common/shelf/shelf_constants.h" | 7 #include "ash/common/shelf/shelf_constants.h" |
8 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
9 #include "ash/common/shelf/wm_shelf_util.h" | 9 #include "ash/common/shelf/wm_shelf_util.h" |
10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 views::Label* text_label = | 72 views::Label* text_label = |
73 new views::Label(l10n_util::GetStringUTF16(IDS_ASH_PALETTE_TITLE)); | 73 new views::Label(l10n_util::GetStringUTF16(IDS_ASH_PALETTE_TITLE)); |
74 text_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 74 text_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
75 text_label->SetFontList(rb.GetFontList(ui::ResourceBundle::BoldFont)); | 75 text_label->SetFontList(rb.GetFontList(ui::ResourceBundle::BoldFont)); |
76 AddChildView(text_label); | 76 AddChildView(text_label); |
77 box_layout->SetFlexForView(text_label, 1); | 77 box_layout->SetFlexForView(text_label, 1); |
78 | 78 |
79 help_button_ = new ash::TrayPopupHeaderButton(this, IDR_AURA_UBER_TRAY_HELP, | 79 help_button_ = new ash::TrayPopupHeaderButton(this, IDR_AURA_UBER_TRAY_HELP, |
80 IDS_ASH_STATUS_TRAY_HELP); | 80 IDS_ASH_STATUS_TRAY_HELP); |
81 help_button_->SetTooltipText( | 81 help_button_->SetTooltipText( |
82 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SHUTDOWN)); | 82 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP)); |
83 AddChildView(help_button_); | 83 AddChildView(help_button_); |
84 | 84 |
85 AddChildView(CreateSeparator(views::Separator::VERTICAL)); | 85 AddChildView(CreateSeparator(views::Separator::VERTICAL)); |
86 | 86 |
87 settings_button_ = new ash::TrayPopupHeaderButton( | 87 settings_button_ = new ash::TrayPopupHeaderButton( |
88 this, IDR_AURA_UBER_TRAY_SETTINGS, IDS_ASH_STATUS_TRAY_SETTINGS); | 88 this, IDR_AURA_UBER_TRAY_SETTINGS, IDS_ASH_STATUS_TRAY_SETTINGS); |
89 settings_button_->SetTooltipText( | 89 settings_button_->SetTooltipText( |
90 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SETTINGS)); | 90 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SETTINGS)); |
91 AddChildView(settings_button_); | 91 AddChildView(settings_button_); |
92 } | 92 } |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 WmShell::Get()->GetSessionStateDelegate(); | 323 WmShell::Get()->GetSessionStateDelegate(); |
324 | 324 |
325 SetVisible(!session_state_delegate->IsScreenLocked() && | 325 SetVisible(!session_state_delegate->IsScreenLocked() && |
326 session_state_delegate->GetSessionState() == | 326 session_state_delegate->GetSessionState() == |
327 SessionStateDelegate::SESSION_STATE_ACTIVE && | 327 SessionStateDelegate::SESSION_STATE_ACTIVE && |
328 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() != | 328 WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() != |
329 LoginStatus::KIOSK_APP); | 329 LoginStatus::KIOSK_APP); |
330 } | 330 } |
331 | 331 |
332 } // namespace ash | 332 } // namespace ash |
OLD | NEW |