ash/shell/content/client/shell_browser_main_parts.cc - Issue 2576913002: Use mojo app list interfaces for mash and classic ash.

Unified Diff: ash/shell/content/client/shell_browser_main_parts.cc

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)

Patch Set: Fix test name. Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/shell/content/client/shell_browser_main_parts.cc

diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc

index 7fac63e99aa2c30d9963c2d13017b2ba78807439..bb8584002a4f4139d61f266366c6158ccaeb2a15 100644

--- a/ash/shell/content/client/shell_browser_main_parts.cc

+++ b/ash/shell/content/client/shell_browser_main_parts.cc

@@ -10,6 +10,7 @@

#include "ash/content/shell_content_state.h"

#include "ash/shell.h"

#include "ash/shell/content/shell_content_state_impl.h"

+#include "ash/shell/example_app_list_presenter.h"

#include "ash/shell/shell_delegate_impl.h"

#include "ash/shell/window_watcher.h"

#include "ash/shell_init_params.h"

@@ -27,6 +28,7 @@

#include "content/shell/browser/shell_browser_context.h"

#include "content/shell/browser/shell_net_log.h"

#include "net/base/net_module.h"

+#include "ui/app_list/presenter/app_list.h"

#include "ui/aura/env.h"

#include "ui/aura/window.h"

#include "ui/aura/window_tree_host.h"

@@ -146,6 +148,11 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {

ash::shell::InitWindowTypeLauncher();

+ // Initialize the example app list presenter.

+ example_app_list_presenter_ = base::MakeUnique<ExampleAppListPresenter>();

mfomitchev 2016/12/22 03:17:45 Wait, this is executed in production code. If Exam

msw 2016/12/22 16:31:52 This is //ash/shell, which is only used for the as

mfomitchev 2016/12/22 18:27:11 Ah, ok, thanks for the clarification

+ WmShell::Get()->app_list()->SetAppListPresenter(

+ example_app_list_presenter_->CreateInterfacePtrAndBind());

ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();

}