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

Unified Diff: mash/task_viewer/task_viewer.cc

Issue 1764253002: Rename shell.mojom to connector.mojom, ApplicationManager to Shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@32exe
Patch Set: . Created 4 years, 10 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 | « content/test/data/web_ui_mojo_shell_test.js ('k') | mojo/mojo_base.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/task_viewer/task_viewer.cc
diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc
index 15176d734d61b37994272f4688194b0209669a4c..8d183e262cc29345c93f52f3465b3b7c4bf044fe 100644
--- a/mash/task_viewer/task_viewer.cc
+++ b/mash/task_viewer/task_viewer.cc
@@ -17,7 +17,7 @@
#include "mojo/services/package_manager/public/interfaces/catalog.mojom.h"
#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/connector.h"
-#include "mojo/shell/public/interfaces/application_manager.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
#include "ui/base/models/table_model.h"
#include "ui/views/background.h"
#include "ui/views/controls/button/label_button.h"
@@ -266,12 +266,12 @@ void TaskViewer::Initialize(mojo::Connector* connector,
aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
views::WindowManagerConnection::Create(connector);
- mojo::shell::mojom::ApplicationManagerPtr application_manager;
- connector->ConnectToInterface("mojo:shell", &application_manager);
+ mojo::shell::mojom::ShellPtr shell;
+ connector->ConnectToInterface("mojo:shell", &shell);
mojo::shell::mojom::InstanceListenerPtr listener;
mojo::shell::mojom::InstanceListenerRequest request = GetProxy(&listener);
- application_manager->AddInstanceListener(std::move(listener));
+ shell->AddInstanceListener(std::move(listener));
package_manager::mojom::CatalogPtr catalog;
connector->ConnectToInterface("mojo:package_manager", &catalog);
« no previous file with comments | « content/test/data/web_ui_mojo_shell_test.js ('k') | mojo/mojo_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698