chrome/browser/chromeos/login/users/wallpaper/wallpaper_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: chrome/browser/chromeos/login/users/wallpaper/wallpaper_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/workspace/workspace_layout_manager_keyboard_unittest.cc ('K') | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc ('k') | chrome/browser/chromeos/policy/display_rotation_default_handler.cc » ('j') | ui/display/manager/display_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

index fc6473404a801b7077dd3082364079eda397e2be..aed5b2a18e7e5e788060a29cd878dc5e1b06e0d1 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

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

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

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

#include "base/command_line.h"

#include "base/files/file_path.h"

#include "base/files/file_util.h"

@@ -28,6 +27,8 @@

#include "components/prefs/pref_service.h"

#include "components/prefs/testing_pref_service.h"

#include "testing/gtest/include/gtest/gtest.h"

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

kylechar 2016/10/24 14:55:15 Is DisplayManager used here?

oshima 2016/10/24 19:29:16 looks like these are no longer used.

rjkroege 2016/10/25 23:30:26 Done. Both removed.

+#include "ui/display/test/display_manager_test_api.h"

#include "ui/gfx/image/image.h"

using namespace ash;