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

Side by Side Diff: ash/shelf/shelf_background_animator.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
« no previous file with comments | « ash/shelf/shelf_alignment_menu.cc ('k') | ash/shelf/shelf_background_animator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ 5 #ifndef ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
6 #define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ 6 #define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/common/wallpaper/wallpaper_controller_observer.h"
12 #include "ash/public/cpp/shelf_types.h" 13 #include "ash/public/cpp/shelf_types.h"
13 #include "ash/shelf/wm_shelf_observer.h" 14 #include "ash/shelf/wm_shelf_observer.h"
14 #include "ash/wallpaper/wallpaper_controller_observer.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "third_party/skia/include/core/SkColor.h" 17 #include "third_party/skia/include/core/SkColor.h"
18 #include "ui/gfx/animation/animation_delegate.h" 18 #include "ui/gfx/animation/animation_delegate.h"
19 19
20 namespace gfx { 20 namespace gfx {
21 class SlideAnimation; 21 class SlideAnimation;
22 } // namespace gfx 22 } // namespace gfx
23 23
24 namespace ash { 24 namespace ash {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 AnimationValues item_background_values_; 178 AnimationValues item_background_values_;
179 179
180 base::ObserverList<ShelfBackgroundAnimatorObserver> observers_; 180 base::ObserverList<ShelfBackgroundAnimatorObserver> observers_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(ShelfBackgroundAnimator); 182 DISALLOW_COPY_AND_ASSIGN(ShelfBackgroundAnimator);
183 }; 183 };
184 184
185 } // namespace ash 185 } // namespace ash
186 186
187 #endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ 187 #endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_alignment_menu.cc ('k') | ash/shelf/shelf_background_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698