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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/chromeos/tray_display_unittest.cc

Issue 1150913002: Save and restore unified mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/shell.cc ('k') | ash/test/display_manager_test_api.h » ('j') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display_unittest.cc
diff --git a/ash/system/chromeos/tray_display_unittest.cc b/ash/system/chromeos/tray_display_unittest.cc
index 32c8182dfe5c5388bb2766feaa9143e0188842ca..c682c48ebf5ead33086a07c5e9b801e1d302d413 100644
--- a/ash/system/chromeos/tray_display_unittest.cc
+++ b/ash/system/chromeos/tray_display_unittest.cc
@@ -10,6 +10,7 @@
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
+#include "ash/test/display_manager_test_api.h"
#include "ash/test/test_system_tray_delegate.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
@@ -313,6 +314,7 @@ TEST_F(TrayDisplayTest, InternalDisplayResized) {
CheckAccessibleName();
// Unified mode
+ test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);
UpdateDisplay("300x200,400x500");
« no previous file with comments | « ash/shell.cc ('k') | ash/test/display_manager_test_api.h » ('j') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698