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

Side by Side Diff: ash/shelf/shelf_item_types.h

Issue 1978443002: Make the IME menu panel more system-like. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/shelf/shelf_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_ITEM_TYPES_H_ 5 #ifndef ASH_SHELF_SHELF_ITEM_TYPES_H_
6 #define ASH_SHELF_SHELF_ITEM_TYPES_H_ 6 #define ASH_SHELF_SHELF_ITEM_TYPES_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 20 matching lines...) Expand all
31 31
32 // Represents a platform app. 32 // Represents a platform app.
33 TYPE_PLATFORM_APP, 33 TYPE_PLATFORM_APP,
34 34
35 // Represents a windowed V1 browser app. 35 // Represents a windowed V1 browser app.
36 TYPE_WINDOWED_APP, 36 TYPE_WINDOWED_APP,
37 37
38 // Represents a dialog. 38 // Represents a dialog.
39 TYPE_DIALOG, 39 TYPE_DIALOG,
40 40
41 // The expanded IME menu in the shelf.
42 TYPE_IME_MENU,
43
41 // Default value. 44 // Default value.
42 TYPE_UNDEFINED, 45 TYPE_UNDEFINED,
43 }; 46 };
44 47
45 // Represents the status of applications in the shelf. 48 // Represents the status of applications in the shelf.
46 enum ShelfItemStatus { 49 enum ShelfItemStatus {
47 // A closed shelf item, i.e. has no live instance. 50 // A closed shelf item, i.e. has no live instance.
48 STATUS_CLOSED, 51 STATUS_CLOSED,
49 // A shelf item that has live instance. 52 // A shelf item that has live instance.
50 STATUS_RUNNING, 53 STATUS_RUNNING,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Resource id of the image to display on the shelf. 87 // Resource id of the image to display on the shelf.
85 int image_resource_id; 88 int image_resource_id;
86 89
87 // Title of the item. 90 // Title of the item.
88 base::string16 title; 91 base::string16 title;
89 }; 92 };
90 93
91 } // namespace ash 94 } // namespace ash
92 95
93 #endif // ASH_SHELF_SHELF_ITEM_TYPES_H_ 96 #endif // ASH_SHELF_SHELF_ITEM_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698