| 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/date/date_default_view.h" | 5 #include "ash/system/date/date_default_view.h" |
| 6 | 6 |
| 7 #include "ash/metrics/user_metrics_recorder.h" | 7 #include "ash/metrics/user_metrics_recorder.h" |
| 8 #include "ash/session/session_state_delegate.h" | 8 #include "ash/session/session_state_delegate.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/date/date_view.h" | 10 #include "ash/system/date/date_view.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 help_ = new TrayPopupHeaderButton(this, | 55 help_ = new TrayPopupHeaderButton(this, |
| 56 IDR_AURA_UBER_TRAY_HELP, | 56 IDR_AURA_UBER_TRAY_HELP, |
| 57 IDR_AURA_UBER_TRAY_HELP, | 57 IDR_AURA_UBER_TRAY_HELP, |
| 58 IDR_AURA_UBER_TRAY_HELP_HOVER, | 58 IDR_AURA_UBER_TRAY_HELP_HOVER, |
| 59 IDR_AURA_UBER_TRAY_HELP_HOVER, | 59 IDR_AURA_UBER_TRAY_HELP_HOVER, |
| 60 IDS_ASH_STATUS_TRAY_HELP); | 60 IDS_ASH_STATUS_TRAY_HELP); |
| 61 help_->SetTooltipText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP)); | 61 help_->SetTooltipText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP)); |
| 62 view->AddButton(help_); | 62 view->AddButton(help_); |
| 63 | 63 |
| 64 #if !defined(OS_WIN) | 64 #if !defined(OS_WIN) |
| 65 if (login != ash::user::LOGGED_IN_LOCKED && | 65 if (login != ash::user::LOGGED_IN_LOCKED) { |
| 66 login != ash::user::LOGGED_IN_RETAIL_MODE) { | |
| 67 shutdown_ = new TrayPopupHeaderButton(this, | 66 shutdown_ = new TrayPopupHeaderButton(this, |
| 68 IDR_AURA_UBER_TRAY_SHUTDOWN, | 67 IDR_AURA_UBER_TRAY_SHUTDOWN, |
| 69 IDR_AURA_UBER_TRAY_SHUTDOWN, | 68 IDR_AURA_UBER_TRAY_SHUTDOWN, |
| 70 IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, | 69 IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, |
| 71 IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, | 70 IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, |
| 72 IDS_ASH_STATUS_TRAY_SHUTDOWN); | 71 IDS_ASH_STATUS_TRAY_SHUTDOWN); |
| 73 shutdown_->SetTooltipText( | 72 shutdown_->SetTooltipText( |
| 74 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SHUTDOWN)); | 73 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SHUTDOWN)); |
| 75 view->AddButton(shutdown_); | 74 view->AddButton(shutdown_); |
| 76 } | 75 } |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 tray_delegate->ShutDown(); | 114 tray_delegate->ShutDown(); |
| 116 } else if (sender == lock_) { | 115 } else if (sender == lock_) { |
| 117 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN); | 116 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN); |
| 118 tray_delegate->RequestLockScreen(); | 117 tray_delegate->RequestLockScreen(); |
| 119 } else { | 118 } else { |
| 120 NOTREACHED(); | 119 NOTREACHED(); |
| 121 } | 120 } |
| 122 } | 121 } |
| 123 | 122 |
| 124 } // namespace ash | 123 } // namespace ash |
| OLD | NEW |