Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1658)

Unified Diff: ash/shell.cc

Issue 2647833003: Adds AppListDelegate to AppList that is notified on visibility changes (Closed)
Patch Set: move Created 3 years, 11 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
« no previous file with comments | « ash/shell.h ('k') | ui/app_list/presenter/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index fa1e9a5e8d4a39f03261d44c7153f38db9278a8a..c0bcd1496d28793479141f665a2a092f21c8d80d 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -12,6 +12,7 @@
#include "ash/accelerators/accelerator_delegate.h"
#include "ash/accelerators/magnifier_key_scroller.h"
#include "ash/accelerators/spoken_feedback_toggler.h"
+#include "ash/app_list/app_list_delegate_impl.h"
#include "ash/aura/wm_shell_aura.h"
#include "ash/autoclick/autoclick_controller.h"
#include "ash/common/accelerators/accelerator_controller.h"
@@ -530,6 +531,9 @@ Shell::~Shell() {
ScreenAsh::CreateScreenForShutdown();
display_configuration_controller_.reset();
+ // AppListDelegateImpl depends upon AppList.
+ app_list_delegate_impl_.reset();
+
wm_shell_->Shutdown();
// Depends on |focus_client_|, so must be destroyed before.
window_tree_host_manager_.reset();
@@ -567,6 +571,9 @@ void Shell::Init(const ShellInitParams& init_params) {
wm_shell_->Initialize(init_params.blocking_pool);
+ if (is_mash)
+ app_list_delegate_impl_ = base::MakeUnique<AppListDelegateImpl>();
+
// TODO(sky): move creation to WmShell.
if (!is_mash)
immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
« no previous file with comments | « ash/shell.h ('k') | ui/app_list/presenter/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698