| Index: mash/shelf/shelf_constants.h
|
| diff --git a/ash/shelf/shelf_constants.h b/mash/shelf/shelf_constants.h
|
| similarity index 59%
|
| copy from ash/shelf/shelf_constants.h
|
| copy to mash/shelf/shelf_constants.h
|
| index 0ff82802bb2acaf159bedb85b676d169ace96930..19d926270ac7b161dc1dd350db2d34430ed245f2 100644
|
| --- a/ash/shelf/shelf_constants.h
|
| +++ b/mash/shelf/shelf_constants.h
|
| @@ -2,32 +2,32 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_SHELF_SHELF_CONSTANTS_H_
|
| -#define ASH_SHELF_SHELF_CONSTANTS_H_
|
| +#ifndef MASH_SHELF_SHELF_CONSTANTS_H_
|
| +#define MASH_SHELF_SHELF_CONSTANTS_H_
|
|
|
| -#include "ash/ash_export.h"
|
|
|
| -namespace ash {
|
| +namespace mash {
|
| +namespace shelf {
|
|
|
| // Max alpha of the shelf background.
|
| -ASH_EXPORT extern const int kShelfBackgroundAlpha;
|
| +extern const int kShelfBackgroundAlpha;
|
|
|
| // Invalid image resource id used for ShelfItemDetails.
|
| extern const int kInvalidImageResourceID;
|
|
|
| -const int kInvalidShelfID = 0;
|
| +extern const int kInvalidShelfID;
|
|
|
| // Size of the shelf when visible (height when the shelf is horizontal).
|
| -ASH_EXPORT extern const int kShelfSize;
|
| +extern const int kShelfSize;
|
|
|
| // Size of the space between buttons on the shelf.
|
| -ASH_EXPORT extern const int kShelfButtonSpacing;
|
| +extern const int kShelfButtonSpacing;
|
|
|
| // Size allocated for each button on the shelf.
|
| -ASH_EXPORT extern const int kShelfButtonSize;
|
| +extern const int kShelfButtonSize;
|
|
|
| // Animation duration for switching black shelf and dock background on and off.
|
| -ASH_EXPORT extern const int kTimeToSwitchBackgroundMs;
|
| +extern const int kTimeToSwitchBackgroundMs;
|
|
|
| // The direction of the focus cycling.
|
| enum CycleDirection {
|
| @@ -35,6 +35,7 @@ enum CycleDirection {
|
| CYCLE_BACKWARD
|
| };
|
|
|
| -} // namespace ash
|
| +} // namespace shelf
|
| +} // namespace mash
|
|
|
| -#endif // ASH_SHELF_SHELF_CONSTANTS_H_
|
| +#endif // MASH_SHELF_SHELF_CONSTANTS_H_
|
|
|