ash/shell.h - Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate

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/shell.h

Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for LauncherTest and observing LauncherModel in DelegateManager Created 7 years, 3 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/shell.h

diff --git a/ash/shell.h b/ash/shell.h

index c4762ab73d5f64432df7108fc952566f6bc0659d..3b5638667faf31b625f495b27dd83c756f321818 100644

--- a/ash/shell.h

+++ b/ash/shell.h

@@ -75,6 +75,7 @@ class DisplayController;

class HighContrastController;

class Launcher;

class LauncherDelegate;

+class LauncherItemDelegate;

class LauncherItemDelegateManager;

class LauncherModel;

class MagnificationController;

@@ -101,7 +102,6 @@ class WindowSelectorController;

namespace internal {

class AcceleratorFilter;

class AppListController;

-class AppListLauncherItemDelegate;

class CaptureController;

class DisplayChangeObserver;

class DisplayErrorObserver;

@@ -547,8 +547,6 @@ class ASH_EXPORT Shell

scoped_ptr<SessionStateDelegate> session_state_delegate_;

scoped_ptr<LauncherDelegate> launcher_delegate_;

scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;

- scoped_ptr<internal::AppListLauncherItemDelegate>

- app_list_launcher_item_delegate_;

scoped_ptr<LauncherModel> launcher_model_;

« ash/launcher/launcher_util.h ('K') | « ash/launcher/launcher_view_unittest.cc ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')