chrome/browser/chromeos/customization/customization_wallpaper_downloader_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/customization/customization_wallpaper_downloader_browsertest.cc

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

Patch Set: Address comments. 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/common/accelerators/accelerator_controller.cc ('K') | « ash/wallpaper/wallpaper_widget_controller.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc

diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc

index 49d6b5163a0e717f65d82de6dc27830bb5e86274..db2dcc8af1d6fcf05b1d167af6e93c307731c343 100644

--- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc

+++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc

@@ -6,8 +6,8 @@

#include <vector>

-#include "ash/shell.h"

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

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

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

#include "base/command_line.h"

#include "base/files/scoped_temp_dir.h"

#include "base/macros.h"

@@ -228,7 +228,7 @@ class CustomizationWallpaperDownloaderBrowserTest

~CustomizationWallpaperDownloaderBrowserTest() override {}

void SetUpOnMainThread() override {

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

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

local_state_ = g_browser_process->local_state();

}