chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc - Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf

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: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)

Patch Set: rebase Created 3 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 | « chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

index 092f3d42d54a6928f21a4d94a58303e80bee1e33..7bea64400c69f04e0fef89f2246de61f7f3b07d0 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

@@ -6,8 +6,8 @@

#include "ash/content/shell_content_state.h"

#include "ash/public/cpp/shell_window_ids.h"

+#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_widget.h"

-#include "ash/shelf/wm_shelf.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/ash_test_environment_content.h"

@@ -1038,7 +1038,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, AnimationSteps) {

EXPECT_FALSE(CoversScreen(window(1)));

EXPECT_EQ("S[A], H[B], H[C]", GetStatus());

EXPECT_EQ("A", GetOwnersOfVisibleWindowsAsString());

- WmShelf* shelf = GetPrimaryShelf();

+ Shelf* shelf = GetPrimaryShelf();

EXPECT_NE(SHELF_AUTO_HIDE_ALWAYS_HIDDEN, shelf->auto_hide_behavior());

EXPECT_EQ(1.0f, window(0)->layer()->GetTargetOpacity());

ShelfWidget* shelf_widget = shelf->shelf_widget();

@@ -1321,7 +1321,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, TestBlackBarCover) {

multi_user_window_manager()->SetWindowOwner(window(0), account_id_A);

multi_user_window_manager()->SetWindowOwner(window(1), account_id_B);

- WmShelf* shelf = GetPrimaryShelf();

+ Shelf* shelf = GetPrimaryShelf();

// Turn the use of delays and animation on.

multi_user_window_manager()->SetAnimationSpeedForTest(