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_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ |
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ |
7 | 7 |
8 #include "ash/launcher/launcher_alignment_menu.h" | |
9 #include "ash/launcher/launcher_types.h" | 8 #include "ash/launcher/launcher_types.h" |
| 9 #include "ash/shelf/shelf_alignment_menu.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/gtest_prod_util.h" | 11 #include "base/gtest_prod_util.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "ui/base/models/simple_menu_model.h" | 13 #include "ui/base/models/simple_menu_model.h" |
14 | 14 |
15 class ChromeLauncherController; | 15 class ChromeLauncherController; |
16 | 16 |
17 namespace aura { | 17 namespace aura { |
18 class RootWindow; | 18 class RootWindow; |
19 } | 19 } |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 }; | 77 }; |
78 | 78 |
79 // Does |item_| represent a valid item? See description of constructor for | 79 // Does |item_| represent a valid item? See description of constructor for |
80 // details on why it may not be valid. | 80 // details on why it may not be valid. |
81 bool is_valid_item() const { return item_.id != 0; } | 81 bool is_valid_item() const { return item_.id != 0; } |
82 | 82 |
83 ChromeLauncherController* controller_; | 83 ChromeLauncherController* controller_; |
84 | 84 |
85 ash::LauncherItem item_; | 85 ash::LauncherItem item_; |
86 | 86 |
87 ash::LauncherAlignmentMenu launcher_alignment_menu_; | 87 ash::ShelfAlignmentMenu shelf_alignment_menu_; |
88 | 88 |
89 scoped_ptr<extensions::ContextMenuMatcher> extension_items_; | 89 scoped_ptr<extensions::ContextMenuMatcher> extension_items_; |
90 | 90 |
91 aura::RootWindow* root_window_; | 91 aura::RootWindow* root_window_; |
92 | 92 |
93 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu); | 93 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu); |
94 }; | 94 }; |
95 | 95 |
96 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ | 96 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ |
OLD | NEW |