chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc - Issue 2046513003: mash: Move shelf model and item classes 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: chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly

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/wm/system_gesture_event_filter_unittest.cc ('k') | chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"	5 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"

6	6

7 #include "ash/shelf/shelf_item_types.h"	7 #include "ash/common/shelf/shelf_item_types.h"

8 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	8 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

9 #include "chrome/grit/generated_resources.h"	9 #include "chrome/grit/generated_resources.h"

10	10

11 ArcLauncherContextMenu::ArcLauncherContextMenu(	11 ArcLauncherContextMenu::ArcLauncherContextMenu(

12 ChromeLauncherController* controller,	12 ChromeLauncherController* controller,

13 const ash::ShelfItem* item,	13 const ash::ShelfItem* item,

14 ash::Shelf* shelf)	14 ash::Shelf* shelf)

15 : LauncherContextMenu(controller, item, shelf) {	15 : LauncherContextMenu(controller, item, shelf) {

16 Init();	16 Init();

17 }	17 }

(...skipping 11 matching lines...) Expand all Loading...
29 AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);	29 AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);

30 AddSeparator(ui::NORMAL_SEPARATOR);	30 AddSeparator(ui::NORMAL_SEPARATOR);

31 AddShelfOptionsMenu();	31 AddShelfOptionsMenu();

32 }	32 }

33	33

34 bool ArcLauncherContextMenu::IsCommandIdEnabled(int command_id) const {	34 bool ArcLauncherContextMenu::IsCommandIdEnabled(int command_id) const {

35 if (command_id == MENU_OPEN_NEW)	35 if (command_id == MENU_OPEN_NEW)

36 return true;	36 return true;

37 return LauncherContextMenu::IsCommandIdEnabled(command_id);	37 return LauncherContextMenu::IsCommandIdEnabled(command_id);

38 }	38 }

OLD	NEW