ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc - Issue 2766543002: Move even more from WmShell to Shell

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/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)

Patch Set: Created 3 years, 9 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/common/frame/caption_buttons/frame_caption_button_container_view.cc ('k') | ash/common/frame/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

diff --git a/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

index f84fe43f372ebd7e8dea5c9ec0453a6dfb5e6e85..ff23f8911f85d64c788581f06004eadee7bcf68a 100644

--- a/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

+++ b/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

@@ -7,9 +7,9 @@

#include "ash/common/ash_layout_constants.h"

#include "ash/common/frame/caption_buttons/frame_caption_button.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

-#include "ash/common/wm_shell.h"

#include "ash/resources/grit/ash_resources.h"

#include "ash/resources/vector_icons/vector_icons.h"

+#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ui/gfx/geometry/rect.h"

#include "ui/views/widget/widget.h"

@@ -165,7 +165,7 @@ TEST_F(FrameCaptionButtonContainerViewTest,

// Hidden size button should result in minimize button animating to the

// right. The size button should not be visible, but should not have moved.

- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(

+ Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(

true);

container.UpdateSizeButtonVisibility();

test.EndAnimations();

@@ -185,7 +185,7 @@ TEST_F(FrameCaptionButtonContainerViewTest,

// Revealing the size button should cause the minimize button to return to its

// original position.

- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(

+ Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(

false);

container.UpdateSizeButtonVisibility();

// Calling code needs to layout in response to size change.