ash/shelf/shelf_layout_manager_unittest.cc - Issue 1119953002: Enable display rotation, magnifier in unified desktop mode

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/shelf/shelf_layout_manager_unittest.cc

Issue 1119953002: Enable display rotation, magnifier in unified desktop mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« ash/host/ash_remote_window_tree_host_win.cc ('K') | « ash/screen_util_unittest.cc ('k') | ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/shelf/shelf_layout_manager_unittest.cc

diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc

index 64f136678d8fcfc3cab62863a13ac89b09e1a74c..ac421a75f1fc5a127339d67afc69e2abe2d5c7c9 100644

--- a/ash/shelf/shelf_layout_manager_unittest.cc

+++ b/ash/shelf/shelf_layout_manager_unittest.cc

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

#include "ash/system/tray/system_tray.h"

#include "ash/system/tray/system_tray_item.h"

#include "ash/test/ash_test_base.h"

-#include "ash/test/display_manager_test_api.h"

#include "ash/test/shelf_test_api.h"

#include "ash/wm/window_state.h"

#include "ash/wm/window_util.h"

@@ -2278,8 +2277,7 @@ TEST_F(ShelfLayoutManagerTest, ShelfLayoutInUnifiedDesktop) {

return;

DisplayManager* display_manager = Shell::GetInstance()->display_manager();

- test::DisplayManagerTestApi test_api(display_manager);

- test_api.SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);

+ display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);

display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);

UpdateDisplay("500x500, 500x500");