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

Unified Diff: ash/shelf/shelf_item_types.h

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: Created 4 years, 6 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/shelf/shelf_item_delegate_manager.cc ('k') | ash/shelf/shelf_item_types.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_item_types.h
diff --git a/ash/shelf/shelf_item_types.h b/ash/shelf/shelf_item_types.h
deleted file mode 100644
index 8d5ea8a7bb81c60d0aae742c9d285c0b4998907a..0000000000000000000000000000000000000000
--- a/ash/shelf/shelf_item_types.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2014 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_SHELF_SHELF_ITEM_TYPES_H_
-#define ASH_SHELF_SHELF_ITEM_TYPES_H_
-
-#include <vector>
-
-#include "ash/ash_export.h"
-#include "base/strings/string16.h"
-#include "ui/gfx/image/image_skia.h"
-
-namespace ash {
-
-typedef int ShelfID;
-
-// The type of a shelf item.
-enum ShelfItemType {
- // Represents a running app panel.
- TYPE_APP_PANEL,
-
- // Represents a pinned shortcut to an app.
- TYPE_APP_SHORTCUT,
-
- // Toggles visiblity of the app list.
- TYPE_APP_LIST,
-
- // The browser shortcut button.
- TYPE_BROWSER_SHORTCUT,
-
- // Represents a platform app.
- TYPE_PLATFORM_APP,
-
- // Represents a windowed V1 browser app.
- TYPE_WINDOWED_APP,
-
- // Represents a dialog.
- TYPE_DIALOG,
-
- // The expanded IME menu in the shelf.
- TYPE_IME_MENU,
-
- // Default value.
- TYPE_UNDEFINED,
-};
-
-// Represents the status of applications in the shelf.
-enum ShelfItemStatus {
- // A closed shelf item, i.e. has no live instance.
- STATUS_CLOSED,
- // A shelf item that has live instance.
- STATUS_RUNNING,
- // An active shelf item that has focus.
- STATUS_ACTIVE,
- // A shelf item that needs user's attention.
- STATUS_ATTENTION,
-};
-
-struct ASH_EXPORT ShelfItem {
- ShelfItem();
- ~ShelfItem();
-
- ShelfItemType type;
-
- // Image to display in the shelf.
- gfx::ImageSkia image;
-
- // Assigned by the model when the item is added.
- ShelfID id;
-
- // Running status.
- ShelfItemStatus status;
-};
-
-typedef std::vector<ShelfItem> ShelfItems;
-
-// ShelfItemDetails may be set on Window (by way of
-// SetShelfItemDetailsForWindow) to make the window appear in the shelf. See
-// ShelfWindowWatcher for details.
-struct ASH_EXPORT ShelfItemDetails {
- ShelfItemDetails();
- ~ShelfItemDetails();
-
- ShelfItemType type;
-
- // Resource id of the image to display on the shelf.
- int image_resource_id;
-
- // Title of the item.
- base::string16 title;
-};
-
-} // namespace ash
-
-#endif // ASH_SHELF_SHELF_ITEM_TYPES_H_
« no previous file with comments | « ash/shelf/shelf_item_delegate_manager.cc ('k') | ash/shelf/shelf_item_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698