chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_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_policy_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') | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc ('k') | components/wallpaper/wallpaper_resizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f36f981f5748ac0c60f5551163ac7e6093addbe7..661d30dbb71bb755a249300b943d939be638dbbd 100644

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

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

@@ -8,9 +8,9 @@

#include <string>

#include <vector>

-#include "ash/shell.h"

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

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

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

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

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

#include "base/command_line.h"

#include "base/compiler_specific.h"

#include "base/files/file_path.h"

@@ -115,7 +115,7 @@ SkColor ComputeAverageColor(const SkBitmap& bitmap) {

// Obtain wallpaper image and return its average ARGB color.

SkColor GetAverageWallpaperColor() {

const gfx::ImageSkia image =

- ash::Shell::GetInstance()->wallpaper_controller()->GetWallpaper();

+ ash::WmShell::Get()->wallpaper_controller()->GetWallpaper();

const gfx::ImageSkiaRep& representation = image.GetRepresentation(1.);

if (representation.is_null()) {

@@ -199,7 +199,7 @@ class WallpaperManagerPolicyTest : public LoginManagerTest,

void SetUpOnMainThread() override {

LoginManagerTest::SetUpOnMainThread();

- ash::Shell::GetInstance()->wallpaper_controller()->AddObserver(this);

+ ash::WmShell::Get()->wallpaper_controller()->AddObserver(this);

// Set up policy signing.

user_policy_builders_[0] = GetUserPolicyBuilder(testUsers_[0]);

@@ -207,7 +207,7 @@ class WallpaperManagerPolicyTest : public LoginManagerTest,

}

void TearDownOnMainThread() override {

- ash::Shell::GetInstance()->wallpaper_controller()->RemoveObserver(this);

+ ash::WmShell::Get()->wallpaper_controller()->RemoveObserver(this);

LoginManagerTest::TearDownOnMainThread();

}