Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: ash/public/cpp/shelf_item_types.h

Issue 2669633003: mash: Fix MusPropertyMirrorAsh for owned properties; add test. (Closed)
Patch Set: Fix ash shell Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/public/cpp/mus_property_mirror_ash.cc ('k') | ash/public/cpp/shelf_item_types.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « ash/public/cpp/mus_property_mirror_ash.cc ('k') | ash/public/cpp/shelf_item_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698