| Index: ash/mus/wallpaper_delegate_mus.h
|
| diff --git a/ash/mus/wallpaper_delegate_mus.h b/ash/mus/wallpaper_delegate_mus.h
|
| index cfdda18cb07eb212d6afe152e1d2e4d7d8b1c6c3..6b03d1ab4b4fd3d0e592d6cd36e8ee5dbbcaac58 100644
|
| --- a/ash/mus/wallpaper_delegate_mus.h
|
| +++ b/ash/mus/wallpaper_delegate_mus.h
|
| @@ -6,19 +6,13 @@
|
| #define ASH_MUS_WALLPAPER_DELEGATE_MUS_H_
|
|
|
| #include "ash/common/wallpaper/wallpaper_delegate.h"
|
| -#include "ash/public/interfaces/wallpaper.mojom.h"
|
| #include "base/macros.h"
|
|
|
| -namespace shell {
|
| -class Connector;
|
| -}
|
| -
|
| namespace ash {
|
|
|
| -class WallpaperDelegateMus : public WallpaperDelegate,
|
| - public mojom::WallpaperController {
|
| +class WallpaperDelegateMus : public WallpaperDelegate {
|
| public:
|
| - explicit WallpaperDelegateMus(shell::Connector* connector);
|
| + WallpaperDelegateMus();
|
| ~WallpaperDelegateMus() override;
|
|
|
| private:
|
| @@ -29,17 +23,10 @@ class WallpaperDelegateMus : public WallpaperDelegate,
|
| bool ShouldShowInitialAnimation() override;
|
| void UpdateWallpaper(bool clear_cache) override;
|
| void InitializeWallpaper() override;
|
| - void OpenSetWallpaperPage() override;
|
| bool CanOpenSetWallpaperPage() override;
|
| void OnWallpaperAnimationFinished() override;
|
| void OnWallpaperBootAnimationFinished() override;
|
|
|
| - // mojom::WallpaperController overrides:
|
| - void SetWallpaper(const SkBitmap& wallpaper,
|
| - mojom::WallpaperLayout layout) override;
|
| -
|
| - shell::Connector* connector_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(WallpaperDelegateMus);
|
| };
|
|
|
|
|