| Index: ash/shelf/shelf_observer.h
 | 
| diff --git a/ash/shelf/wm_shelf_observer.h b/ash/shelf/shelf_observer.h
 | 
| similarity index 79%
 | 
| rename from ash/shelf/wm_shelf_observer.h
 | 
| rename to ash/shelf/shelf_observer.h
 | 
| index 55033bef25a21cdda96429ccebc8cf4f54fda5a5..06248f71b4014f076ad59cc53bea10a29663d286 100644
 | 
| --- a/ash/shelf/wm_shelf_observer.h
 | 
| +++ b/ash/shelf/shelf_observer.h
 | 
| @@ -2,8 +2,8 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#ifndef ASH_SHELF_WM_SHELF_OBSERVER_H_
 | 
| -#define ASH_SHELF_WM_SHELF_OBSERVER_H_
 | 
| +#ifndef ASH_SHELF_SHELF_OBSERVER_H_
 | 
| +#define ASH_SHELF_SHELF_OBSERVER_H_
 | 
|  
 | 
|  #include "ash/ash_export.h"
 | 
|  #include "ash/public/cpp/shelf_types.h"
 | 
| @@ -13,7 +13,7 @@ namespace ash {
 | 
|  enum class AnimationChangeType;
 | 
|  
 | 
|  // Used to observe changes to the shelf.
 | 
| -class ASH_EXPORT WmShelfObserver {
 | 
| +class ASH_EXPORT ShelfObserver {
 | 
|   public:
 | 
|    virtual void OnBackgroundTypeChanged(ShelfBackgroundType background_type,
 | 
|                                         AnimationChangeType change_type) {}
 | 
| @@ -22,9 +22,9 @@ class ASH_EXPORT WmShelfObserver {
 | 
|    virtual void OnShelfIconPositionsChanged() {}
 | 
|  
 | 
|   protected:
 | 
| -  virtual ~WmShelfObserver() {}
 | 
| +  virtual ~ShelfObserver() {}
 | 
|  };
 | 
|  
 | 
|  }  // namespace ash
 | 
|  
 | 
| -#endif  // ASH_SHELF_WM_SHELF_OBSERVER_H_
 | 
| +#endif  // ASH_SHELF_SHELF_OBSERVER_H_
 | 
| 
 |