ash/display/unified_mouse_warp_controller_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/display/unified_mouse_warp_controller_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/display/unified_mouse_warp_controller_unittest.cc

diff --git a/ash/display/unified_mouse_warp_controller_unittest.cc b/ash/display/unified_mouse_warp_controller_unittest.cc

index 599d6eed034f919212a6cf57a11c8f0a663fb28f..e176141d08ea1a27d99751c71941ae2a97dc90ce 100644

--- a/ash/display/unified_mouse_warp_controller_unittest.cc

+++ b/ash/display/unified_mouse_warp_controller_unittest.cc

@@ -4,6 +4,7 @@

#include "ash/display/unified_mouse_warp_controller.h"

+#include "ash/display/display_manager.h"

#include "ash/display/mouse_cursor_event_filter.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

@@ -22,7 +23,7 @@ class UnifiedMouseWarpControllerTest : public test::AshTestBase {

void SetUp() override {

test::AshTestBase::SetUp();

- test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();

+ Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(true);

}

protected:

« no previous file with comments | « ash/display/display_util_unittest.cc ('k') | ash/display/window_tree_host_manager.cc » ('j') | no next file with comments »