| Index: ash/system/chromeos/multi_user/user_switch_util.cc
|
| diff --git a/ash/system/chromeos/multi_user/user_switch_util.cc b/ash/system/chromeos/multi_user/user_switch_util.cc
|
| index a5fb6e2f76661df60e4abfb11b8e6c8f72f983d0..0762d28cfef885bfafe4ecec079443fde16e7cc8 100644
|
| --- a/ash/system/chromeos/multi_user/user_switch_util.cc
|
| +++ b/ash/system/chromeos/multi_user/user_switch_util.cc
|
| @@ -101,11 +101,11 @@ bool DesktopCastingWarningView::Accept() {
|
| }
|
|
|
| base::string16 DesktopCastingWarningView::GetDialogButtonLabel(
|
| - ui::DialogButton button) const {
|
| + ui::DialogButton button) const {
|
| return l10n_util::GetStringUTF16(
|
| - button == ui::DIALOG_BUTTON_OK ?
|
| - IDS_DESKTOP_CASTING_ACTIVE_BUTTON_SWITCH_USER :
|
| - IDS_DESKTOP_CASTING_ACTIVE_BUTTON_ABORT_USER_SWITCH);
|
| + button == ui::DIALOG_BUTTON_OK
|
| + ? IDS_DESKTOP_CASTING_ACTIVE_BUTTON_SWITCH_USER
|
| + : IDS_DESKTOP_CASTING_ACTIVE_BUTTON_ABORT_USER_SWITCH);
|
| }
|
|
|
| bool DesktopCastingWarningView::IsDialogButtonEnabled(
|
| @@ -167,8 +167,7 @@ void DesktopCastingWarningView::InitDialog() {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // Factory function.
|
|
|
| -void TrySwitchingActiveUser(
|
| - const base::Callback<void()> on_switch) {
|
| +void TrySwitchingActiveUser(const base::Callback<void()> on_switch) {
|
| // Some unit tests do not have a shell. In that case simply execute.
|
| if (!ash::Shell::HasInstance()) {
|
| on_switch.Run();
|
|
|