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

Unified Diff: ash/test/ash_test_base.cc

Issue 17445002: Updates the display message in the uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 7 years, 6 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
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 8e93f2743b0440f2fa72efa6d8a512ace81d6f47..646e18251d3983334f60ee268c83f4c73ebb34a8 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -30,6 +30,10 @@
#include "ui/gfx/point.h"
#include "ui/gfx/screen.h"
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/tray_display.h"
+#endif
+
#if defined(OS_WIN)
#include "ash/test/test_metro_viewer_process_host.h"
#include "base/test/test_process_killer_win.h"
@@ -114,6 +118,14 @@ void AshTestBase::SetUp() {
Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
ash::Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
+#if defined(OS_CHROMEOS)
+ // We do not want to see the notification for display configuration change,
+ // since it may trap mouse events unexpectedly.
+ // TODO(mukai): remove this code when the display notification code is moved
+ // to the message center.
+ internal::TrayDisplay::SetDisplayNotificationsEnabledForTest(false);
+#endif
+
#if defined(OS_WIN)
if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
!CommandLine::ForCurrentProcess()->HasSwitch(
« ash/system/chromeos/tray_display.cc ('K') | « ash/system/chromeos/tray_display_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698