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

Unified Diff: ash/mus/sysui_application.cc

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 8 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/mus/sysui_application.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/sysui_application.cc
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc
index c6f603831986cadc0efd34db6ed92a853fcd6cf2..ca415a9287a9b5f947d8fe5b136d364c0f008786 100644
--- a/ash/mus/sysui_application.cc
+++ b/ash/mus/sysui_application.cc
@@ -8,6 +8,7 @@
#include "ash/host/ash_window_tree_host_init_params.h"
#include "ash/host/ash_window_tree_host_platform.h"
#include "ash/mus/keyboard_ui_mus.h"
+#include "ash/mus/shelf_delegate_mus.h"
#include "ash/mus/shell_delegate_mus.h"
#include "ash/mus/stub_context_factory.h"
#include "ash/root_window_settings.h"
@@ -294,8 +295,17 @@ void SysUIApplication::Initialize(mojo::Connector* connector,
}
bool SysUIApplication::AcceptConnection(mojo::Connection* connection) {
+ connection->AddInterface<mash::shelf::mojom::ShelfController>(this);
return true;
}
+void SysUIApplication::Create(
+ mojo::Connection* connection,
+ mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
+ mash::shelf::mojom::ShelfController* shelf_controller =
+ static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
+ shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
+}
+
} // namespace sysui
} // namespace ash
« no previous file with comments | « ash/mus/sysui_application.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698