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

Unified Diff: ash/sysui/sysui_application.cc

Issue 2335833002: mash: Port ash_sysui app list presenter to mojo:ash. (Closed)
Patch Set: Reorder ShellDelegateMus members. Created 4 years, 3 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/sysui/shell_delegate_mus.cc ('k') | chrome/app/mojo/chrome_manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/sysui_application.cc
diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc
index 88af42005469e3ac1181fc5943d995950c51be3f..ac14515a145bcd6782278bca9e16bcbed52899f8 100644
--- a/ash/sysui/sysui_application.cc
+++ b/ash/sysui/sysui_application.cc
@@ -21,7 +21,6 @@
#include "ash/root_window_settings.h"
#include "ash/shell.h"
#include "ash/shell_init_params.h"
-#include "ash/sysui/app_list_presenter_mus.h"
#include "ash/sysui/keyboard_ui_mus.h"
#include "ash/sysui/shell_delegate_mus.h"
#include "ash/sysui/stub_context_factory.h"
@@ -235,9 +234,7 @@ class AshInit {
AshWindowTreeHost::SetFactory(base::Bind(&CreateWindowTreeHostMus));
- std::unique_ptr<AppListPresenterMus> app_list_presenter =
- base::MakeUnique<AppListPresenterMus>(connector);
- ash_delegate_ = new ShellDelegateMus(std::move(app_list_presenter));
+ ash_delegate_ = new ShellDelegateMus();
InitializeComponents();
« no previous file with comments | « ash/sysui/shell_delegate_mus.cc ('k') | chrome/app/mojo/chrome_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698