chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc - Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell

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/views/frame/browser_non_client_frame_view_ash_browsertest.cc

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: order 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

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

index 672d5e21886e957db0d1939bc1dcabd0aa9568b8..26da1c48143f3633843c20cf35ebaa9d0f9087c1 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

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

#include "ash/common/ash_constants.h"

#include "ash/common/ash_switches.h"

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

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

#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

#include "ash/frame/header_painter.h"

#include "ash/shell.h"

@@ -284,16 +285,18 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,

widget->non_client_view()->frame_view());

const gfx::Rect initial = frame_view->caption_button_container_->bounds();

- ash::Shell::GetInstance()->maximize_mode_controller()->

- EnableMaximizeModeWindowManager(true);

+ ash::WmShell::Get()

+ ->maximize_mode_controller()

+ ->EnableMaximizeModeWindowManager(true);

ash::FrameCaptionButtonContainerView::TestApi test(frame_view->

caption_button_container_);

test.EndAnimations();

const gfx::Rect during_maximize = frame_view->caption_button_container_->

bounds();

EXPECT_GT(initial.width(), during_maximize.width());

- ash::Shell::GetInstance()->maximize_mode_controller()->

- EnableMaximizeModeWindowManager(false);

+ ash::WmShell::Get()

+ ->maximize_mode_controller()

+ ->EnableMaximizeModeWindowManager(false);

test.EndAnimations();

const gfx::Rect after_restore = frame_view->caption_button_container_->

bounds();