| Index: ash/public/cpp/shelf_item_types.h
|
| diff --git a/ash/common/shelf/shelf_item_types.h b/ash/public/cpp/shelf_item_types.h
|
| similarity index 86%
|
| copy from ash/common/shelf/shelf_item_types.h
|
| copy to ash/public/cpp/shelf_item_types.h
|
| index ea021bb7d78c9b6cb019ffe1af3037c6c1bf7009..448f08e16f72cd2b0c00365da77303e7836e0d6d 100644
|
| --- a/ash/common/shelf/shelf_item_types.h
|
| +++ b/ash/public/cpp/shelf_item_types.h
|
| @@ -1,21 +1,20 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2017 The Chromium Authors. All rights reserved.
|
| // 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_ITEM_TYPES_H_
|
| -#define ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_
|
| +#ifndef ASH_PUBLIC_CPP_SHELF_ITEM_TYPES_H_
|
| +#define ASH_PUBLIC_CPP_SHELF_ITEM_TYPES_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "ash/ash_export.h"
|
| -#include "ash/common/shelf/shelf_constants.h"
|
| #include "base/strings/string16.h"
|
| #include "ui/gfx/image/image_skia.h"
|
|
|
| namespace ash {
|
|
|
| typedef int ShelfID;
|
| +const int kInvalidShelfID = 0;
|
|
|
| // The type of a shelf item.
|
| enum ShelfItemType {
|
| @@ -55,7 +54,7 @@ enum ShelfItemStatus {
|
| STATUS_ATTENTION,
|
| };
|
|
|
| -struct ASH_EXPORT ShelfItem {
|
| +struct ShelfItem {
|
| ShelfItem();
|
| ShelfItem(const ShelfItem& shelf_item);
|
| ~ShelfItem();
|
| @@ -88,4 +87,4 @@ typedef std::vector<ShelfItem> ShelfItems;
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_
|
| +#endif // ASH_PUBLIC_CPP_SHELF_ITEM_TYPES_H_
|
|
|