| 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_SHELL_CONTEXT_MENU_H_ | 5 #ifndef ASH_SHELL_CONTEXT_MENU_H_ | 
| 6 #define ASH_SHELL_CONTEXT_MENU_H_ | 6 #define ASH_SHELL_CONTEXT_MENU_H_ | 
| 7 | 7 | 
| 8 #include "ash/common/shelf/shelf_alignment_menu.h" | 8 #include "ash/shelf/shelf_alignment_menu.h" | 
| 9 #include "base/macros.h" | 9 #include "base/macros.h" | 
| 10 #include "ui/base/models/simple_menu_model.h" | 10 #include "ui/base/models/simple_menu_model.h" | 
| 11 | 11 | 
| 12 namespace ash { | 12 namespace ash { | 
| 13 | 13 | 
| 14 class WmShelf; | 14 class WmShelf; | 
| 15 | 15 | 
| 16 namespace shell { | 16 namespace shell { | 
| 17 | 17 | 
| 18 // Context menu for the ash shell. | 18 // Context menu for the ash shell. | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 36   WmShelf* wm_shelf_; | 36   WmShelf* wm_shelf_; | 
| 37   ShelfAlignmentMenu alignment_menu_; | 37   ShelfAlignmentMenu alignment_menu_; | 
| 38 | 38 | 
| 39   DISALLOW_COPY_AND_ASSIGN(ContextMenu); | 39   DISALLOW_COPY_AND_ASSIGN(ContextMenu); | 
| 40 }; | 40 }; | 
| 41 | 41 | 
| 42 }  // namespace shell | 42 }  // namespace shell | 
| 43 }  // namespace ash | 43 }  // namespace ash | 
| 44 | 44 | 
| 45 #endif  // ASH_SHELL_CONTEXT_MENU_H_ | 45 #endif  // ASH_SHELL_CONTEXT_MENU_H_ | 
| OLD | NEW | 
|---|