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

Unified Diff: ash/sysui/wallpaper_delegate_mus.h

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 4 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/sysui/user_wallpaper_delegate_mus.cc ('k') | ash/sysui/wallpaper_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/wallpaper_delegate_mus.h
diff --git a/ash/sysui/user_wallpaper_delegate_mus.h b/ash/sysui/wallpaper_delegate_mus.h
similarity index 65%
rename from ash/sysui/user_wallpaper_delegate_mus.h
rename to ash/sysui/wallpaper_delegate_mus.h
index b616d346ea4f1b2f14dbf99b54d0362d6283849d..6c28e083f626bd3ae6baf14224b7c40942172ee2 100644
--- a/ash/sysui/user_wallpaper_delegate_mus.h
+++ b/ash/sysui/wallpaper_delegate_mus.h
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSUI_USER_WALLPAPER_DELEGATE_MUS_H_
-#define ASH_SYSUI_USER_WALLPAPER_DELEGATE_MUS_H_
+#ifndef ASH_SYSUI_WALLPAPER_DELEGATE_MUS_H_
+#define ASH_SYSUI_WALLPAPER_DELEGATE_MUS_H_
-#include "ash/desktop_background/user_wallpaper_delegate.h"
+#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/public/interfaces/wallpaper.mojom.h"
#include "base/macros.h"
namespace ash {
namespace sysui {
-class UserWallpaperDelegateMus : public UserWallpaperDelegate,
- public mojom::WallpaperController {
+class WallpaperDelegateMus : public WallpaperDelegate,
+ public mojom::WallpaperController {
public:
- UserWallpaperDelegateMus();
- ~UserWallpaperDelegateMus() override;
+ WallpaperDelegateMus();
+ ~WallpaperDelegateMus() override;
private:
- // UserWallpaperDelegate overrides:
+ // WallpaperDelegate overrides:
int GetAnimationType() override;
int GetAnimationDurationOverride() override;
void SetAnimationDurationOverride(int animation_duration_in_ms) override;
@@ -35,10 +35,10 @@ class UserWallpaperDelegateMus : public UserWallpaperDelegate,
void SetWallpaper(const SkBitmap& wallpaper,
mojom::WallpaperLayout layout) override;
- DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegateMus);
+ DISALLOW_COPY_AND_ASSIGN(WallpaperDelegateMus);
};
} // namespace sysui
} // namespace ash
-#endif // ASH_SYSUI_USER_WALLPAPER_DELEGATE_MUS_H_
+#endif // ASH_SYSUI_WALLPAPER_DELEGATE_MUS_H_
« no previous file with comments | « ash/sysui/user_wallpaper_delegate_mus.cc ('k') | ash/sysui/wallpaper_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698