ash/shell/context_menu.cc - Issue 11316323: Cleanup enums for 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/shell/context_menu.cc

Issue 11316323: Cleanup enums for shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: style Created 8 years 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 | Annotate | Revision Log

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 #include "ash/shell/context_menu.h"	5 #include "ash/shell/context_menu.h"

6	6

7 #include "ash/launcher/launcher.h"	7 #include "ash/launcher/launcher.h"

8 #include "ash/root_window_controller.h"	8 #include "ash/root_window_controller.h"

	9 #include "ash/shelf_types.h"

9 #include "ash/shell.h"	10 #include "ash/shell.h"

10 #include "ash/wm/shelf_types.h"

11 #include "grit/ash_strings.h"	11 #include "grit/ash_strings.h"

12 #include "ui/base/l10n/l10n_util.h"	12 #include "ui/base/l10n/l10n_util.h"

13	13

14 namespace ash {	14 namespace ash {

15 namespace shell {	15 namespace shell {

16	16

17 ContextMenu::ContextMenu(aura::RootWindow* root)	17 ContextMenu::ContextMenu(aura::RootWindow* root)

18 : ui::SimpleMenuModel(NULL),	18 : ui::SimpleMenuModel(NULL),

19 root_window_(root),	19 root_window_(root),

20 alignment_menu_(root) {	20 alignment_menu_(root) {

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 Shell::GetInstance()->GetToggledShelfAutoHideBehavior(root_window_),	56 Shell::GetInstance()->GetToggledShelfAutoHideBehavior(root_window_),

57 root_window_);	57 root_window_);

58 break;	58 break;

59 case MENU_ALIGNMENT_MENU:	59 case MENU_ALIGNMENT_MENU:

60 break;	60 break;

61 }	61 }

62 }	62 }

63	63

64 } // namespace shell	64 } // namespace shell

65 } // namespace ash	65 } // namespace ash

OLD	NEW

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