ash/system/chromeos/tray_display_unittest.cc - Issue 1261693004: Allow dynamic enabling/disabling of unified desktop

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1261693004: Allow dynamic enabling/disabling of unified desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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/shelf/shelf_layout_manager_unittest.cc ('k') | ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 f6c205f290624e8233004b94814e6b4c9e681c67..0a232600c74dcdc5f0120edbe9fe9f178e7be7ec 100644

--- a/ash/system/chromeos/tray_display_unittest.cc

+++ b/ash/system/chromeos/tray_display_unittest.cc

@@ -315,9 +315,7 @@ TEST_F(TrayDisplayTest, InternalDisplayResized) {

CheckAccessibleName();

// Unified mode

- test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();

- display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);

- display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);

+ display_manager->SetUnifiedDesktopEnabled(true);

UpdateDisplay("300x200,400x500");

// Update the cache variables as the primary root window changed.

GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);

« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc » ('j') | no next file with comments »