diff options
| author | ben <ben@chromium.org> | 2016-03-04 21:16:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-05 05:17:27 +0000 |
| commit | 15b9a8b847fe280eb141897ea4f0a60fa1060476 (patch) | |
| tree | 27e60ea9a581acb8e0abbaeffcb26aedc796dc0e /mash | |
| parent | c3b24696fbe3e4704caf031a59a4d50a4fcedab7 (diff) | |
| download | chromium_src-15b9a8b847fe280eb141897ea4f0a60fa1060476.zip chromium_src-15b9a8b847fe280eb141897ea4f0a60fa1060476.tar.gz chromium_src-15b9a8b847fe280eb141897ea4f0a60fa1060476.tar.bz2 | |
Rename shell.mojom to connector.mojom and ApplicationManager to Shell
TBR=sky@chromium.org
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1764253002
Cr-Commit-Position: refs/heads/master@{#379459}
Diffstat (limited to 'mash')
| -rw-r--r-- | mash/task_viewer/task_viewer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc index 15176d7..8d183e2 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); |