ash/sysui/context_menu_mus.h - Issue 2046563012: mash: Move shelf menu code to //ash/common/shelf

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/sysui/context_menu_mus.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

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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_SYSUI_CONTEXT_MENU_MUS_H_	5 #ifndef ASH_SYSUI_CONTEXT_MENU_MUS_H_

6 #define ASH_SYSUI_CONTEXT_MENU_MUS_H_	6 #define ASH_SYSUI_CONTEXT_MENU_MUS_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 // Context menu for mash.	16 // Context menu for mash.

17 // TODO(msw): Mimic logic in LauncherContextMenu.	17 // TODO(msw): Mimic logic in LauncherContextMenu.

18 class ContextMenuMus : public ui::SimpleMenuModel,	18 class ContextMenuMus : public ui::SimpleMenuModel,

(...skipping 18 matching lines...) Expand all Loading...
37	37

38 WmShelf* wm_shelf_;	38 WmShelf* wm_shelf_;

39 ShelfAlignmentMenu alignment_menu_;	39 ShelfAlignmentMenu alignment_menu_;

40	40

41 DISALLOW_COPY_AND_ASSIGN(ContextMenuMus);	41 DISALLOW_COPY_AND_ASSIGN(ContextMenuMus);

42 };	42 };

43	43

44 } // namespace ash	44 } // namespace ash

45	45

46 #endif // ASH_SYSUI_CONTEXT_MENU_MUS_H_	46 #endif // ASH_SYSUI_CONTEXT_MENU_MUS_H_

OLD	NEW

« no previous file with comments | « ash/shell/context_menu.h ('k') | ash/sysui/shelf_delegate_mus.cc » ('j') | no next file with comments »