chrome/browser/ui/ash/launcher/launcher_context_menu.h - 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/launcher_context_menu.h

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 | « chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.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 (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 CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_	5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_

6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_	6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_

7	7

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

8 #include "ash/shelf/shelf_alignment_menu.h"	9 #include "ash/shelf/shelf_alignment_menu.h"

9 #include "ash/shelf/shelf_item_types.h"

10 #include "base/gtest_prod_util.h"	10 #include "base/gtest_prod_util.h"

11 #include "base/macros.h"	11 #include "base/macros.h"

12 #include "ui/base/models/simple_menu_model.h"	12 #include "ui/base/models/simple_menu_model.h"

13	13

14 class ChromeLauncherController;	14 class ChromeLauncherController;

15	15

16 namespace ash {	16 namespace ash {

17 class Shelf;	17 class Shelf;

18 }	18 }

19	19

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 ash::ShelfItem item_;	97 ash::ShelfItem item_;

98	98

99 ash::ShelfAlignmentMenu shelf_alignment_menu_;	99 ash::ShelfAlignmentMenu shelf_alignment_menu_;

100	100

101 ash::Shelf* shelf_;	101 ash::Shelf* shelf_;

102	102

103 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);	103 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);

104 };	104 };

105	105

106 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_	106 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_

OLD	NEW