Chromium Code Reviews| Index: ash/display/display_error_observer_chromeos.cc |
| diff --git a/ash/display/display_error_observer_chromeos.cc b/ash/display/display_error_observer_chromeos.cc |
| index a578170645daacd2aff5ed09eecf5ee6f637a17d..f50f1ec167bbef3c81e54d2ae1b30a59e7527837 100644 |
| --- a/ash/display/display_error_observer_chromeos.cc |
| +++ b/ash/display/display_error_observer_chromeos.cc |
| @@ -4,9 +4,11 @@ |
| #include "ash/display/display_error_observer_chromeos.h" |
| +#include "ash/common/system/chromeos/devicetype_utils.h" |
| #include "ash/display/display_util.h" |
| #include "base/strings/string_number_conversions.h" |
| #include "grit/ash_strings.h" |
| +#include "ui/base/l10n/l10n_util.h" |
| namespace ash { |
| @@ -25,10 +27,12 @@ void DisplayErrorObserver::OnDisplayModeChangeFailed( |
| << "."; |
| } |
| - ShowDisplayErrorNotification( |
| + base::string16 message = |
| (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR) |
| - ? IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING |
| - : IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING); |
| + ? l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING) |
| + : ash::SubstituteChromeOSDeviceType( |
| + IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING); |
| + ShowDisplayErrorNotification(message, true); |
|
Evan Stade
2016/12/12 23:44:17
(this one is OK because of the complexity of the a
Greg Levin
2016/12/13 01:48:59
Acknowledged.
|
| } |
| } // namespace ash |