Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Unified Diff: ash/mus/wallpaper_delegate_mus.h

Issue 2413503002: Cleanup mojo Wallpaper interfaces for mash. (Closed)
Patch Set: Sync and rebase again... 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
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/wallpaper_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/wallpaper_delegate_mus.h
diff --git a/ash/mus/wallpaper_delegate_mus.h b/ash/mus/wallpaper_delegate_mus.h
index fe3dbb3801efe09862e470d1b3190e82186a92fe..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 service_manager {
-class Connector;
-}
-
namespace ash {
-class WallpaperDelegateMus : public WallpaperDelegate,
- public mojom::WallpaperController {
+class WallpaperDelegateMus : public WallpaperDelegate {
public:
- explicit WallpaperDelegateMus(service_manager::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;
-
- service_manager::Connector* connector_;
-
DISALLOW_COPY_AND_ASSIGN(WallpaperDelegateMus);
};
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/wallpaper_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698