| Index: ash/launcher/launcher.h
|
| diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
|
| index dea112cae95de680648e46a18c2574e4dc66950e..9650110c74952fbd081faf18406f92ccd76c2073 100644
|
| --- a/ash/launcher/launcher.h
|
| +++ b/ash/launcher/launcher.h
|
| @@ -22,6 +22,7 @@ namespace ash {
|
|
|
| namespace internal {
|
| class FocusCycler;
|
| +class LauncherView;
|
| }
|
|
|
| class LauncherDelegate;
|
| @@ -39,6 +40,9 @@ class ASH_EXPORT Launcher {
|
| void SetStatusWidth(int width);
|
| int GetStatusWidth();
|
|
|
| + // Only to be called for testing. Retrieves the LauncherView.
|
| + internal::LauncherView* GetLauncherViewForTest();
|
| +
|
| LauncherDelegate* delegate() { return delegate_.get(); }
|
|
|
| LauncherModel* model() { return model_.get(); }
|
| @@ -63,6 +67,9 @@ class ASH_EXPORT Launcher {
|
| // Contents view of the widget. Houses the LauncherView.
|
| DelegateView* delegate_view_;
|
|
|
| + // LauncherView used to display icons.
|
| + internal::LauncherView* launcher_view_;
|
| +
|
| scoped_ptr<LauncherDelegate> delegate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Launcher);
|
|
|