| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index c32371fc00d46d4c007dac8fdb99e3959833a4e5..96a89217a37c0c17c8b885936a37987488329940 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -23,7 +23,10 @@
|
| #include "ash/focus_cycler.h"
|
| #include "ash/high_contrast/high_contrast_controller.h"
|
| #include "ash/host/root_window_host_factory.h"
|
| +#include "ash/launcher/app_list_launcher_item_delegate.h"
|
| #include "ash/launcher/launcher_delegate.h"
|
| +#include "ash/launcher/launcher_item_delegate.h"
|
| +#include "ash/launcher/launcher_item_delegate_manager.h"
|
| #include "ash/launcher/launcher_model.h"
|
| #include "ash/magnifier/magnification_controller.h"
|
| #include "ash/magnifier/partial_magnification_controller.h"
|
| @@ -865,9 +868,13 @@ SystemTray* Shell::GetPrimarySystemTray() {
|
|
|
| LauncherDelegate* Shell::GetLauncherDelegate() {
|
| if (!launcher_delegate_) {
|
| + // Creates LauncherItemDelegateManager before LauncherDelegate.
|
| + launcher_item_delegate_manager_.reset(new LauncherItemDelegateManager);
|
| launcher_model_.reset(new LauncherModel);
|
| launcher_delegate_.reset(
|
| delegate_->CreateLauncherDelegate(launcher_model_.get()));
|
| + app_list_launcher_item_delegate_.reset(
|
| + new internal::AppListLauncherItemDelegate);
|
| }
|
| return launcher_delegate_.get();
|
| }
|
|
|