| 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 ASH_WM_SHELL_CONTEXT_MENU_H_ | 5 #ifndef ASH_SHELL_CONTEXT_MENU_H_ |
| 6 #define ASH_WM_SHELL_CONTEXT_MENU_H_ | 6 #define ASH_SHELL_CONTEXT_MENU_H_ |
| 7 | 7 |
| 8 #include "ash/launcher/launcher_alignment_menu.h" | 8 #include "ash/launcher/launcher_alignment_menu.h" |
| 9 #include "ash/shelf_types.h" | 9 #include "ash/shelf/shelf_types.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "ui/base/models/simple_menu_model.h" | 11 #include "ui/base/models/simple_menu_model.h" |
| 12 | 12 |
| 13 namespace aura { | 13 namespace aura { |
| 14 class RootWindow; | 14 class RootWindow; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 namespace shell { | 18 namespace shell { |
| 19 | 19 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 41 aura::RootWindow* root_window_; | 41 aura::RootWindow* root_window_; |
| 42 | 42 |
| 43 LauncherAlignmentMenu alignment_menu_; | 43 LauncherAlignmentMenu alignment_menu_; |
| 44 | 44 |
| 45 DISALLOW_COPY_AND_ASSIGN(ContextMenu); | 45 DISALLOW_COPY_AND_ASSIGN(ContextMenu); |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 } // namespace shell | 48 } // namespace shell |
| 49 } // namespace ash | 49 } // namespace ash |
| 50 | 50 |
| 51 #endif // ASH_WM_SHELL_CONTEXT_MENU_H_ | 51 #endif // ASH_SHELL_CONTEXT_MENU_H_ |
| OLD | NEW |