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

Side by Side Diff: ash/shell/context_menu.h

Issue 2046563012: mash: Move shelf menu code to //ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/sysui/context_menu_mus.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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/shelf/shelf_alignment_menu.h" 8 #include "ash/common/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 19 matching lines...) Expand all
38 WmShelf* wm_shelf_; 38 WmShelf* wm_shelf_;
39 ShelfAlignmentMenu alignment_menu_; 39 ShelfAlignmentMenu alignment_menu_;
40 40
41 DISALLOW_COPY_AND_ASSIGN(ContextMenu); 41 DISALLOW_COPY_AND_ASSIGN(ContextMenu);
42 }; 42 };
43 43
44 } // namespace shell 44 } // namespace shell
45 } // namespace ash 45 } // namespace ash
46 46
47 #endif // ASH_SHELL_CONTEXT_MENU_H_ 47 #endif // ASH_SHELL_CONTEXT_MENU_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/sysui/context_menu_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698