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

Unified Diff: ash/common/wallpaper/wallpaper_controller.h

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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/common/wallpaper/OWNERS ('k') | ash/common/wallpaper/wallpaper_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_controller.h
diff --git a/ash/wallpaper/wallpaper_controller.h b/ash/common/wallpaper/wallpaper_controller.h
similarity index 96%
rename from ash/wallpaper/wallpaper_controller.h
rename to ash/common/wallpaper/wallpaper_controller.h
index aaa3010f25129f563c8c46f7b4838da187a7b7e1..0cead11b420d6446c6b7907378e500fb3d062629 100644
--- a/ash/wallpaper/wallpaper_controller.h
+++ b/ash/common/wallpaper/wallpaper_controller.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
-#define ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
+#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_
+#define ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/shell_observer.h"
+#include "ash/common/wm_display_observer.h"
#include "ash/public/interfaces/wallpaper.mojom.h"
-#include "ash/shell_observer.h"
-#include "ash/wm_display_observer.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
@@ -186,4 +186,4 @@ class ASH_EXPORT WallpaperController
} // namespace ash
-#endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
+#endif // ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_
« no previous file with comments | « ash/common/wallpaper/OWNERS ('k') | ash/common/wallpaper/wallpaper_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698