chrome/browser/ui/ash/launcher/launcher_item_controller.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_item_controller.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/launcher_context_menu_unittest.cc ('k') | no next file » | no next file with comments »

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_ITEM_CONTROLLER_H_	5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_

6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_	6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "ash/shelf/shelf_item_delegate.h"	10 #include "ash/common/shelf/shelf_item_delegate.h"

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

12 #include "base/compiler_specific.h"	12 #include "base/compiler_specific.h"

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

14 #include "base/memory/scoped_vector.h"	14 #include "base/memory/scoped_vector.h"

15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"	15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"

16 #include "ui/events/event.h"	16 #include "ui/events/event.h"

17	17

18 class ChromeLauncherController;	18 class ChromeLauncherController;

19 class ChromeLauncherAppMenuItem;	19 class ChromeLauncherAppMenuItem;

20 class Profile;	20 class Profile;

21	21

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
98 // applications.	98 // applications.

99 int locked_;	99 int locked_;

100	100

101 // Set to true if the launcher item image has been set by the controller.	101 // Set to true if the launcher item image has been set by the controller.

102 bool image_set_by_controller_;	102 bool image_set_by_controller_;

103	103

104 DISALLOW_COPY_AND_ASSIGN(LauncherItemController);	104 DISALLOW_COPY_AND_ASSIGN(LauncherItemController);

105 };	105 };

106	106

107 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_	107 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_

OLD	NEW