trunk/src/ash/shell.h - Issue 25716004: Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

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: trunk/src/ash/shell.h

Issue 25716004: Revert 226547 "Refactor LauncherItemController and LauncherItemD..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 2 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:

Index: trunk/src/ash/shell.h

===================================================================

--- trunk/src/ash/shell.h (revision 226578)

+++ trunk/src/ash/shell.h (working copy)

@@ -75,7 +75,6 @@

class HighContrastController;

class Launcher;

class LauncherDelegate;

-class LauncherItemDelegate;

class LauncherItemDelegateManager;

class LauncherModel;

class MagnificationController;

@@ -102,6 +101,7 @@

namespace internal {

class AcceleratorFilter;

class AppListController;

+class AppListShelfItemDelegate;

class CaptureController;

class DisplayChangeObserver;

class DisplayErrorObserver;

@@ -541,6 +541,8 @@

scoped_ptr<SessionStateDelegate> session_state_delegate_;

scoped_ptr<LauncherDelegate> launcher_delegate_;

scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;

+ scoped_ptr<internal::AppListShelfItemDelegate>

+ app_list_shelf_item_delegate_;

scoped_ptr<LauncherModel> launcher_model_;

« no previous file with comments | « trunk/src/ash/shelf/app_list_shelf_item_delegate.cc ('k') | trunk/src/ash/shell.cc » ('j') | no next file with comments »