ash/wm/lock_layout_manager_unittest.cc - Issue 2445583002: Relocate display_manager from ash to ui

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/wm/lock_layout_manager_unittest.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)

Patch Set: Created 4 years, 2 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

« ash/wm/drag_window_resizer_unittest.cc ('K') | « ash/wm/immersive_fullscreen_controller_unittest.cc ('k') | ash/wm/maximize_mode/maximize_mode_controller_unittest.cc » ('j') | ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/lock_layout_manager_unittest.cc

diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc

index 6c0a35787546136fc6f69f4279a8204e2c6a58d1..8933a3f6b530020688e0999cff40c6f18ac779f2 100644

--- a/ash/wm/lock_layout_manager_unittest.cc

+++ b/ash/wm/lock_layout_manager_unittest.cc

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

// found in the LICENSE file.

#include "ash/common/wm/window_state.h"

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

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

#include "ash/root_window_controller.h"

#include "ash/screen_util.h"

@@ -13,6 +12,7 @@

#include "base/command_line.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/window.h"

+#include "ui/display/manager/display_manager.h"

#include "ui/display/screen.h"

#include "ui/keyboard/keyboard_controller.h"

#include "ui/keyboard/keyboard_switches.h"

@@ -212,17 +212,15 @@ TEST_F(LockLayoutManagerTest, KeyboardBounds) {

keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_DISABLED);

ShowKeyboard(true);

ShowKeyboard(false);

- ash::DisplayManager* display_manager =

- Shell::GetInstance()->display_manager();

- display_manager->SetDisplayRotation(primary_display.id(),

- display::Display::ROTATE_90,

- display::Display::ROTATION_SOURCE_ACTIVE);

+ display_manager()->SetDisplayRotation(

+ primary_display.id(), display::Display::ROTATE_90,

+ display::Display::ROTATION_SOURCE_ACTIVE);

primary_display = display::Screen::GetScreen()->GetPrimaryDisplay();

screen_bounds = primary_display.bounds();

EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());

- display_manager->SetDisplayRotation(primary_display.id(),

- display::Display::ROTATE_0,

- display::Display::ROTATION_SOURCE_ACTIVE);

+ display_manager()->SetDisplayRotation(

+ primary_display.id(), display::Display::ROTATE_0,

+ display::Display::ROTATION_SOURCE_ACTIVE);

// When virtual keyboard overscroll is disabled keyboard bounds do

// affect window bounds.