ash/mus/context_menu_mus.h - Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash.

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

Unified Diff: ash/mus/context_menu_mus.h

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup. Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

Index: ash/mus/context_menu_mus.h

diff --git a/ash/sysui/context_menu_mus.h b/ash/mus/context_menu_mus.h

similarity index 85%

rename from ash/sysui/context_menu_mus.h

rename to ash/mus/context_menu_mus.h

index eb6674533d6aad2b423a5c7651dbf6951c3e813e..06a879c1134b7c9b251c828f3984bd9a69477f30 100644

--- a/ash/sysui/context_menu_mus.h

+++ b/ash/mus/context_menu_mus.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef ASH_SYSUI_CONTEXT_MENU_MUS_H_

-#define ASH_SYSUI_CONTEXT_MENU_MUS_H_

+#ifndef ASH_MUS_CONTEXT_MENU_MUS_H_

+#define ASH_MUS_CONTEXT_MENU_MUS_H_

#include "ash/common/shelf/shelf_alignment_menu.h"

#include "base/macros.h"

@@ -14,7 +14,7 @@ namespace ash {

class WmShelf;

// Context menu for mash.

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

+// TODO(mash): Mimic logic in LauncherContextMenu.

sky 2016/08/25 00:00:32 Unless mash is a real person I would remove the (m

msw 2016/08/25 00:25:14 Done.

class ContextMenuMus : public ui::SimpleMenuModel,

public ui::SimpleMenuModel::Delegate {

public:

@@ -41,4 +41,4 @@ class ContextMenuMus : public ui::SimpleMenuModel,

} // namespace ash

-#endif // ASH_SYSUI_CONTEXT_MENU_MUS_H_

+#endif // ASH_MUS_CONTEXT_MENU_MUS_H_

« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/context_menu_mus.cc » ('j') | ash/mus/native_widget_factory_mus.h » ('J')