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

Unified Diff: ash/mus/wallpaper_delegate_mus.h

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (Closed)
Patch Set: Alternative display info workaround. 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
Index: ash/mus/wallpaper_delegate_mus.h
diff --git a/ash/sysui/wallpaper_delegate_mus.h b/ash/mus/wallpaper_delegate_mus.h
similarity index 82%
rename from ash/sysui/wallpaper_delegate_mus.h
rename to ash/mus/wallpaper_delegate_mus.h
index 6c28e083f626bd3ae6baf14224b7c40942172ee2..cfdda18cb07eb212d6afe152e1d2e4d7d8b1c6c3 100644
--- a/ash/sysui/wallpaper_delegate_mus.h
+++ b/ash/mus/wallpaper_delegate_mus.h
@@ -2,20 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSUI_WALLPAPER_DELEGATE_MUS_H_
-#define ASH_SYSUI_WALLPAPER_DELEGATE_MUS_H_
+#ifndef ASH_MUS_WALLPAPER_DELEGATE_MUS_H_
+#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 {
-namespace sysui {
class WallpaperDelegateMus : public WallpaperDelegate,
public mojom::WallpaperController {
public:
- WallpaperDelegateMus();
+ explicit WallpaperDelegateMus(shell::Connector* connector);
~WallpaperDelegateMus() override;
private:
@@ -35,10 +38,11 @@ class WallpaperDelegateMus : public WallpaperDelegate,
void SetWallpaper(const SkBitmap& wallpaper,
mojom::WallpaperLayout layout) override;
+ shell::Connector* connector_;
+
DISALLOW_COPY_AND_ASSIGN(WallpaperDelegateMus);
};
-} // namespace sysui
} // namespace ash
-#endif // ASH_SYSUI_WALLPAPER_DELEGATE_MUS_H_
+#endif // ASH_MUS_WALLPAPER_DELEGATE_MUS_H_

Powered by Google App Engine
This is Rietveld 408576698