components/mus/ws/user_display_manager_unittest.cc - Issue 2089023002: Promotes remaining global window manager state into WindowManagerState

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: components/mus/ws/user_display_manager_unittest.cc

Issue 2089023002: Promotes remaining global window manager state into WindowManagerState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: override Created 4 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: components/mus/ws/user_display_manager_unittest.cc

diff --git a/components/mus/ws/user_display_manager_unittest.cc b/components/mus/ws/user_display_manager_unittest.cc

index 3e7897ff83bb435ca8f4fe0e8f4f4d428fe3473b..2c2506cce2631ffbb41bbe6c255920c491cff816 100644

--- a/components/mus/ws/user_display_manager_unittest.cc

+++ b/components/mus/ws/user_display_manager_unittest.cc

@@ -16,7 +16,6 @@

#include "components/mus/surfaces/surfaces_state.h"

#include "components/mus/ws/display_binding.h"

#include "components/mus/ws/display_manager.h"

-#include "components/mus/ws/global_window_manager_state.h"

#include "components/mus/ws/ids.h"

#include "components/mus/ws/platform_display.h"

#include "components/mus/ws/platform_display_factory.h"

@@ -137,7 +136,7 @@ TEST_F(UserDisplayManagerTest, OnlyNotifyWhenFrameDecorationsSet) {

// Set the frame decoration values, which should trigger sending immediately.

ASSERT_EQ(1u, display_manager->displays().size());

window_server_->window_manager_window_tree_factory_set()

- ->GetGlobalWindowManagerStateForUser(kUserId1)

+ ->GetWindowManagerStateForUser(kUserId1)

->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());

EXPECT_EQ("OnDisplays 1",

display_manager_observer1.GetAndClearObserverCalls());

@@ -159,7 +158,7 @@ TEST_F(UserDisplayManagerTest, AddObserverAfterFrameDecorationsSet) {

ASSERT_TRUE(user_display_manager1);

ASSERT_EQ(1u, display_manager->displays().size());

window_server_->window_manager_window_tree_factory_set()

- ->GetGlobalWindowManagerStateForUser(kUserId1)

+ ->GetWindowManagerStateForUser(kUserId1)

->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());

UserDisplayManagerTestApi(user_display_manager1)

@@ -184,7 +183,7 @@ TEST_F(UserDisplayManagerTest, AddRemoveDisplay) {

ASSERT_TRUE(user_display_manager1);

ASSERT_EQ(1u, display_manager->displays().size());

window_server_->window_manager_window_tree_factory_set()

- ->GetGlobalWindowManagerStateForUser(kUserId1)

+ ->GetWindowManagerStateForUser(kUserId1)

->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());

UserDisplayManagerTestApi(user_display_manager1)

.SetTestObserver(&display_manager_observer1);

« no previous file with comments | « components/mus/ws/test_utils.cc ('k') | components/mus/ws/user_id_tracker_observer.h » ('j') | no next file with comments »