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

Side by Side Diff: ash/launcher/launcher_types.h

Issue 9590001: Launch panels as popup windows in Aura, and add separate launcher icon logic for panels. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_LAUNCHER_LAUNCHER_TYPES_H_ 5 #ifndef ASH_LAUNCHER_LAUNCHER_TYPES_H_
6 #define ASH_LAUNCHER_LAUNCHER_TYPES_H_ 6 #define ASH_LAUNCHER_LAUNCHER_TYPES_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "third_party/skia/include/core/SkBitmap.h" 11 #include "third_party/skia/include/core/SkBitmap.h"
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 13
14 namespace aura { 14 namespace aura {
15 class Window; 15 class Window;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 19
20 typedef int LauncherID; 20 typedef int LauncherID;
21 21
22 // Type the LauncherItem represents. 22 // Type the LauncherItem represents.
23 enum ASH_EXPORT LauncherItemType { 23 enum ASH_EXPORT LauncherItemType {
24 // Represents a tabbed browser. 24 // Represents a tabbed browser.
25 TYPE_TABBED, 25 TYPE_TABBED,
26 26
27 // Represents an app window. 27 // Represents an app window.
28 TYPE_APP, 28 TYPE_APP,
29 29
30 // Represents an app panel.
31 TYPE_PANEL,
32
30 // Toggles visiblity of the app list. 33 // Toggles visiblity of the app list.
31 TYPE_APP_LIST, 34 TYPE_APP_LIST,
32 35
33 // The browser shortcut button. 36 // The browser shortcut button.
34 TYPE_BROWSER_SHORTCUT, 37 TYPE_BROWSER_SHORTCUT,
35 }; 38 };
36 39
37 struct ASH_EXPORT LauncherItem { 40 struct ASH_EXPORT LauncherItem {
38 LauncherItem(); 41 LauncherItem();
39 explicit LauncherItem(LauncherItemType type); 42 explicit LauncherItem(LauncherItemType type);
(...skipping 10 matching lines...) Expand all
50 53
51 // Assigned by the model when the item is added. 54 // Assigned by the model when the item is added.
52 LauncherID id; 55 LauncherID id;
53 }; 56 };
54 57
55 typedef std::vector<LauncherItem> LauncherItems; 58 typedef std::vector<LauncherItem> LauncherItems;
56 59
57 } // namespace ash 60 } // namespace ash
58 61
59 #endif // ASH_LAUNCHER_LAUNCHER_TYPES_H_ 62 #endif // ASH_LAUNCHER_LAUNCHER_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | ash/launcher/launcher_view.cc » ('j') | chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698