diff options
| author | sadrul <sadrul@chromium.org> | 2015-12-07 15:13:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-07 23:14:43 +0000 |
| commit | 503099f5fad8368e564a51f92702bbcbbd540fb5 (patch) | |
| tree | f22474969b98f14f3e78fe8d91b3ca8735c0b561 /mash/browser_driver | |
| parent | 91ffb4ed89f73e8ef25a619caa435d789656c341 (diff) | |
| download | chromium_src-503099f5fad8368e564a51f92702bbcbbd540fb5.zip chromium_src-503099f5fad8368e564a51f92702bbcbbd540fb5.tar.gz chromium_src-503099f5fad8368e564a51f92702bbcbbd540fb5.tar.bz2 | |
mash/browser-driver: Fix rebinding after wm dies.
From a Binding's error-handler, make sure to Unbind() first before Bind()ing
again.
BUG=none
Review URL: https://codereview.chromium.org/1508843002
Cr-Commit-Position: refs/heads/master@{#363621}
Diffstat (limited to 'mash/browser_driver')
| -rw-r--r-- | mash/browser_driver/browser_driver_application_delegate.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mash/browser_driver/browser_driver_application_delegate.cc b/mash/browser_driver/browser_driver_application_delegate.cc index b5d95f5..64240fc 100644 --- a/mash/browser_driver/browser_driver_application_delegate.cc +++ b/mash/browser_driver/browser_driver_application_delegate.cc @@ -82,6 +82,8 @@ void BrowserDriverApplicationDelegate::AddAccelerators() { mus::mojom::AcceleratorRegistrarPtr registrar; app_->ConnectToService("mojo:desktop_wm", ®istrar); + if (binding_.is_bound()) + binding_.Unbind(); mus::mojom::AcceleratorHandlerPtr handler; binding_.Bind(GetProxy(&handler)); // If the window manager restarts, the handler pipe will close and we'll need |