ash/system/web_notification/ash_popup_alignment_delegate_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/web_notification/ash_popup_alignment_delegate_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

Index: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

index 6601dcaae6e7a7fb422331d7c0b200d4bb2b6ca6..f487c75b90f473667e11af42def5f9ce075b1607 100644

--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

@@ -276,8 +276,7 @@ TEST_F(AshPopupAlignmentDelegateTest, Unified) {

if (!SupportsMultipleDisplays())

return;

DisplayManager* display_manager = Shell::GetInstance()->display_manager();

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

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

+ display_manager->SetUnifiedDesktopEnabled(true);

// Reset the delegate as the primary display's shelf will be destroyed during

// transition.

« no previous file with comments | « ash/system/chromeos/tray_display_unittest.cc ('k') | ash/test/display_manager_test_api.h » ('j') | no next file with comments »