summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authorsimon.hong81@gmail.com <simon.hong81@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-28 05:22:34 +0000
committersimon.hong81@gmail.com <simon.hong81@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-28 05:22:34 +0000
commitcc29ba10009f91780c6d1bae5a828fb78cdeea74 (patch)
tree3bc62135545b45be96ad8076f0014df3c1976fd6 /ash/shell.h
parent5113d1dd6dee32ef919d5520fc0b01587b97b1e4 (diff)
downloadchromium_src-cc29ba10009f91780c6d1bae5a828fb78cdeea74.zip
chromium_src-cc29ba10009f91780c6d1bae5a828fb78cdeea74.tar.gz
chromium_src-cc29ba10009f91780c6d1bae5a828fb78cdeea74.tar.bz2
Refactor LauncherDelegate
(This CL is splitted from https://codereview.chromium.org/11513005/ prior to adding LauncherItem for dialog) Refactor LauncherItem bits in LauncherDelegate into LauncherItemDelegate. LauncherItemDelegateManager helps Launcher/LauncherView to choose right LauncherItemDelegate based on LauncherItemType. * AppListLauncherItemDelegate is added for TYPE_APP_LIST. * LauncherItemManager (subclass of LauncherItemDelegate) will be added for TYPE_DIALOG in the separate CL. R=sky@chromium.org, skuhne@chromium.org BUG=121242, 279105 TEST=browser_tests, unit_tests, ash_unittests Review URL: https://chromiumcodereview.appspot.com/22429004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 5068815..718d1f8 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -75,6 +75,7 @@ class DisplayController;
class HighContrastController;
class Launcher;
class LauncherDelegate;
+class LauncherItemDelegateManager;
class LauncherModel;
class MagnificationController;
class MruWindowTracker;
@@ -101,6 +102,7 @@ namespace internal {
class AcceleratorFilter;
class ActivationController;
class AppListController;
+class AppListLauncherItemDelegate;
class CaptureController;
class DisplayChangeObserver;
class DisplayErrorObserver;
@@ -366,6 +368,10 @@ class ASH_EXPORT Shell
return activation_client_;
}
+ LauncherItemDelegateManager* launcher_item_delegate_manager() {
+ return launcher_item_delegate_manager_.get();
+ }
+
ScreenAsh* screen() { return screen_; }
// Force the shelf to query for it's current visibility state.
@@ -541,6 +547,9 @@ class ASH_EXPORT Shell
scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
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_;