diff options
| author | ben <ben@chromium.org> | 2016-03-16 21:40:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 04:41:55 +0000 |
| commit | d146bb0affa82f8a910fe99d23845ed542395ebe (patch) | |
| tree | ef0e5ee6480b11d0fe2d74d3fc4fe1cc00e9e2bf /mash/example | |
| parent | 2e0ba7b22dc533d059da03dbee4824e036754b2a (diff) | |
| download | chromium_src-d146bb0affa82f8a910fe99d23845ed542395ebe.zip chromium_src-d146bb0affa82f8a910fe99d23845ed542395ebe.tar.gz chromium_src-d146bb0affa82f8a910fe99d23845ed542395ebe.tar.bz2 | |
Cascade shutdown of instances
BUG=
Review URL: https://codereview.chromium.org/1810713002
Cr-Commit-Position: refs/heads/master@{#381660}
Diffstat (limited to 'mash/example')
| -rw-r--r-- | mash/example/window_type_launcher/BUILD.gn | 1 | ||||
| -rw-r--r-- | mash/example/window_type_launcher/window_type_launcher.cc | 18 | ||||
| -rw-r--r-- | mash/example/window_type_launcher/window_type_launcher.h | 1 |
3 files changed, 12 insertions, 8 deletions
diff --git a/mash/example/window_type_launcher/BUILD.gn b/mash/example/window_type_launcher/BUILD.gn index 245d93d..7018487 100644 --- a/mash/example/window_type_launcher/BUILD.gn +++ b/mash/example/window_type_launcher/BUILD.gn @@ -24,7 +24,6 @@ executable("window_type_launcher") { "//base:base_static", "//build/config/sanitizers:deps", "//components/mus/public/interfaces", - "//mash/login/public/interfaces", "//mash/shell/public/interfaces", "//mojo/common:common_base", "//mojo/converters/geometry", diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc index b469395..1d56a87 100644 --- a/mash/example/window_type_launcher/window_type_launcher.cc +++ b/mash/example/window_type_launcher/window_type_launcher.cc @@ -5,8 +5,8 @@ #include "mash/example/window_type_launcher/window_type_launcher.h" #include "base/macros.h" +#include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" -#include "mash/login/public/interfaces/login.mojom.h" #include "mash/shell/public/interfaces/shell.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/shell/public/cpp/connection.h" @@ -283,13 +283,13 @@ class WindowTypeLauncherView : public views::WidgetDelegateView, connector_->ConnectToInterface("mojo:mash_shell", &shell); shell->LockScreen(); } else if (sender == logout_button_) { - mash::login::mojom::LoginPtr login; - connector_->ConnectToInterface("mojo:login", &login); - login->Logout(); + mash::shell::mojom::ShellPtr shell; + connector_->ConnectToInterface("mojo:mash_shell", &shell); + shell->Logout(); } else if (sender == switch_user_button_) { - mash::login::mojom::LoginPtr login; - connector_->ConnectToInterface("mojo:login", &login); - login->SwitchUser(); + mash::shell::mojom::ShellPtr shell; + connector_->ConnectToInterface("mojo:mash_shell", &shell); + shell->SwitchUser(); } else if (sender == widgets_button_) { NOTIMPLEMENTED(); } @@ -383,3 +383,7 @@ void WindowTypeLauncher::Initialize(mojo::Connector* connector, widget->Init(params); widget->Show(); } + +void WindowTypeLauncher::ShellConnectionLost() { + base::MessageLoop::current()->QuitWhenIdle(); +} diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/mash/example/window_type_launcher/window_type_launcher.h index dbbf40f..4d5a266 100644 --- a/mash/example/window_type_launcher/window_type_launcher.h +++ b/mash/example/window_type_launcher/window_type_launcher.h @@ -22,6 +22,7 @@ class WindowTypeLauncher : public mojo::ShellClient { // mojo::ShellClient: void Initialize(mojo::Connector* connector, const mojo::Identity& identity, uint32_t id) override; + void ShellConnectionLost() override; scoped_ptr<views::AuraInit> aura_init_; |