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

Unified Diff: ash/display/display_manager_unittest.cc

Issue 1952353003: Show message to indicate that mirriring with more than 3 display is not supported. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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
« no previous file with comments | « ash/display/display_error_observer_chromeos_unittest.cc ('k') | ash/display/display_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 3acfd336f9682b5e6c428e6753fd7df65ab13dae..fd8491b5e5bdfedcd70a92f3a1bfe7cb7f0e3e43 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/accelerators/accelerator_commands.h"
#include "ash/ash_switches.h"
+#include "ash/display/display_configuration_controller.h"
#include "ash/display/display_info.h"
#include "ash/display/display_layout_store.h"
#include "ash/display/display_util.h"
@@ -22,10 +23,12 @@
#include "base/format_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
+#include "grit/ash_strings.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
#include "ui/aura/window_observer.h"
#include "ui/aura/window_tree_host.h"
+#include "ui/base/l10n/l10n_util.h"
#include "ui/display/display.h"
#include "ui/display/display_observer.h"
#include "ui/display/manager/display_layout_builder.h"
@@ -453,9 +456,14 @@ TEST_F(DisplayManagerTest, NoMirrorInThreeDisplays) {
return;
UpdateDisplay("640x480,320x200,400x300");
- display_manager()->SetMirrorMode(true);
+ ash::Shell::GetInstance()->display_configuration_controller()->SetMirrorMode(
+ true, true);
EXPECT_FALSE(display_manager()->IsInMirrorMode());
EXPECT_EQ(3u, display_manager()->GetNumDisplays());
+#if defined(OS_CHROMEOS)
+ EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_MIRRORING_NOT_SUPPORTED),
+ GetDisplayErrorNotificationMessageForTest());
+#endif
}
TEST_F(DisplayManagerTest, OverscanInsetsTest) {
« no previous file with comments | « ash/display/display_error_observer_chromeos_unittest.cc ('k') | ash/display/display_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698