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

Side by Side Diff: ash/common/wallpaper/wallpaper_widget_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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ 5 #ifndef ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
6 #define ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ 6 #define ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "ui/aura/window_observer.h" 12 #include "ui/aura/window_observer.h"
13 #include "ui/views/widget/widget_observer.h" 13 #include "ui/views/widget/widget_observer.h"
14 14
15 namespace ash { 15 namespace ash {
16 16
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 WallpaperWidgetController* GetController(bool pass_ownership); 91 WallpaperWidgetController* GetController(bool pass_ownership);
92 92
93 private: 93 private:
94 std::unique_ptr<WallpaperWidgetController> controller_; 94 std::unique_ptr<WallpaperWidgetController> controller_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(AnimatingWallpaperWidgetController); 96 DISALLOW_COPY_AND_ASSIGN(AnimatingWallpaperWidgetController);
97 }; 97 };
98 98
99 } // namespace ash 99 } // namespace ash
100 100
101 #endif // ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_ 101 #endif // ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/common/wallpaper/wallpaper_view.cc ('k') | ash/common/wallpaper/wallpaper_widget_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698