chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc - Issue 2318223003: mash: Migrate wallpaper controllers to ash/common.

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_browsertest.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)

Patch Set: Cleanup. Created 4 years, 3 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/mus/bridge/wm_shell_mus.cc ('K') | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc » ('j') | components/wallpaper/wallpaper_resizer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index aea3f49b4105d2c184d6511e87897ab90af8037d..1426ff0b319acca46aa84f5660abc4ebf2516c5f 100644

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

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

@@ -6,14 +6,13 @@

#include <stddef.h>

+#include "ash/common/wallpaper/wallpaper_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/display/display_manager.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/ash_test_helper.h"

#include "ash/test/display_manager_test_api.h"

-#include "ash/wallpaper/wallpaper_controller.h"

-#include "ash/wallpaper/wallpaper_controller_observer.h"

#include "base/command_line.h"

#include "base/compiler_specific.h"

#include "base/files/file_path.h"

@@ -72,7 +71,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {

~WallpaperManagerBrowserTest() override {}

void SetUpOnMainThread() override {

- controller_ = ash::Shell::GetInstance()->wallpaper_controller();

+ controller_ = ash::WmShell::Get()->wallpaper_controller();

controller_->set_wallpaper_reload_delay_for_test(0);

local_state_ = g_browser_process->local_state();

UpdateDisplay("800x600");