Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1866)

Unified Diff: ash/display/display_error_observer_chromeos.cc

Issue 2490323003: Improve monitor compatibility error, move feedback link into button (Closed)
Patch Set: Rename variable |optional_field| -> |data| Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
} // namespace ash
« no previous file with comments | « ash/display/display_configuration_controller.cc ('k') | ash/display/display_error_observer_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698