| Index: ash/shelf/shelf_background_animator.h
|
| diff --git a/ash/common/shelf/shelf_background_animator.h b/ash/shelf/shelf_background_animator.h
|
| similarity index 96%
|
| rename from ash/common/shelf/shelf_background_animator.h
|
| rename to ash/shelf/shelf_background_animator.h
|
| index 72747494b7e431e7272891e9e8121aec9b23323e..892d3ce40b3410b8219b67a1819668db40df42ec 100644
|
| --- a/ash/common/shelf/shelf_background_animator.h
|
| +++ b/ash/shelf/shelf_background_animator.h
|
| @@ -2,16 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
| -#define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
| +#ifndef ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
| +#define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
|
|
| #include <memory>
|
| #include <vector>
|
|
|
| #include "ash/ash_export.h"
|
| -#include "ash/common/shelf/wm_shelf_observer.h"
|
| -#include "ash/common/wallpaper/wallpaper_controller_observer.h"
|
| #include "ash/public/cpp/shelf_types.h"
|
| +#include "ash/shelf/wm_shelf_observer.h"
|
| +#include "ash/wallpaper/wallpaper_controller_observer.h"
|
| #include "base/macros.h"
|
| #include "base/observer_list.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| @@ -184,4 +184,4 @@ class ASH_EXPORT ShelfBackgroundAnimator : public WmShelfObserver,
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
| +#endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
|
|