OLD | NEW |
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 CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
| 9 #include "ash/launcher/launcher_alignment_menu.h" |
9 #include "ash/launcher/launcher_types.h" | 10 #include "ash/launcher/launcher_types.h" |
10 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
11 #include "ui/base/models/simple_menu_model.h" | 12 #include "ui/base/models/simple_menu_model.h" |
12 | 13 |
13 class ChromeLauncherController; | 14 class ChromeLauncherController; |
14 | 15 |
15 // Context menu shown for a launcher item. | 16 // Context menu shown for a launcher item. |
16 class LauncherContextMenu : public ui::SimpleMenuModel, | 17 class LauncherContextMenu : public ui::SimpleMenuModel, |
17 public ui::SimpleMenuModel::Delegate { | 18 public ui::SimpleMenuModel::Delegate { |
18 public: | 19 public: |
(...skipping 18 matching lines...) Expand all Loading... |
37 enum MenuItem { | 38 enum MenuItem { |
38 MENU_OPEN, | 39 MENU_OPEN, |
39 MENU_CLOSE, | 40 MENU_CLOSE, |
40 MENU_PIN, | 41 MENU_PIN, |
41 LAUNCH_TYPE_PINNED_TAB, | 42 LAUNCH_TYPE_PINNED_TAB, |
42 LAUNCH_TYPE_REGULAR_TAB, | 43 LAUNCH_TYPE_REGULAR_TAB, |
43 LAUNCH_TYPE_FULLSCREEN, | 44 LAUNCH_TYPE_FULLSCREEN, |
44 LAUNCH_TYPE_WINDOW, | 45 LAUNCH_TYPE_WINDOW, |
45 MENU_AUTO_HIDE, | 46 MENU_AUTO_HIDE, |
46 MENU_NEW_WINDOW, | 47 MENU_NEW_WINDOW, |
47 MENU_NEW_INCOGNITO_WINDOW | 48 MENU_NEW_INCOGNITO_WINDOW, |
| 49 MENU_ALIGNMENT_MENU, |
48 }; | 50 }; |
49 | 51 |
50 // Does |item_| represent a valid item? See description of constructor for | 52 // Does |item_| represent a valid item? See description of constructor for |
51 // details on why it may not be valid. | 53 // details on why it may not be valid. |
52 bool is_valid_item() const { return item_.id != 0; } | 54 bool is_valid_item() const { return item_.id != 0; } |
53 | 55 |
54 ChromeLauncherController* controller_; | 56 ChromeLauncherController* controller_; |
| 57 |
55 ash::LauncherItem item_; | 58 ash::LauncherItem item_; |
56 | 59 |
| 60 ash::LauncherAlignmentMenu alignment_menu_; |
| 61 |
57 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu); | 62 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu); |
58 }; | 63 }; |
59 | 64 |
60 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ | 65 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ |
OLD | NEW |