| Index: mash/shelf/shelf_types.h
 | 
| diff --git a/ash/shelf/shelf_types.h b/mash/shelf/shelf_types.h
 | 
| similarity index 85%
 | 
| copy from ash/shelf/shelf_types.h
 | 
| copy to mash/shelf/shelf_types.h
 | 
| index 4ee3b94c09a94a373efb59163d8aed64c0351adf..e2a7ee4a6faab4f999f3ccf85db370d312f84aac 100644
 | 
| --- a/ash/shelf/shelf_types.h
 | 
| +++ b/mash/shelf/shelf_types.h
 | 
| @@ -2,10 +2,11 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#ifndef ASH_SHELF_SHELF_TYPES_H_
 | 
| -#define ASH_SHELF_SHELF_TYPES_H_
 | 
| +#ifndef MASH_SHELF_SHELF_TYPES_H_
 | 
| +#define MASH_SHELF_SHELF_TYPES_H_
 | 
|  
 | 
| -namespace ash {
 | 
| +namespace mash {
 | 
| +namespace shelf {
 | 
|  
 | 
|  enum ShelfAlignment {
 | 
|    SHELF_ALIGNMENT_BOTTOM,
 | 
| @@ -52,6 +53,7 @@ enum ShelfBackgroundType {
 | 
|    SHELF_BACKGROUND_MAXIMIZED,
 | 
|  };
 | 
|  
 | 
| -}  // namespace ash
 | 
| +}  // namespace shelf
 | 
| +}  // namespace mash
 | 
|  
 | 
| -#endif  // ASH_SHELF_SHELF_TYPES_H_
 | 
| +#endif  // MASH_SHELF_SHELF_TYPES_H_
 | 
| 
 |