| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mash/browser_driver/browser_driver_application_delegate.h" | 5 #include "mash/browser_driver/browser_driver_application_delegate.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "components/mus/public/cpp/event_matcher.h" | 10 #include "components/mus/public/cpp/event_matcher.h" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 default: | 75 default: |
| 76 NOTREACHED(); | 76 NOTREACHED(); |
| 77 break; | 77 break; |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 | 80 |
| 81 void BrowserDriverApplicationDelegate::AddAccelerators() { | 81 void BrowserDriverApplicationDelegate::AddAccelerators() { |
| 82 // TODO(beng): find some other way to get the window manager. I don't like | 82 // TODO(beng): find some other way to get the window manager. I don't like |
| 83 // having to specify it by URL because it may differ per display. | 83 // having to specify it by URL because it may differ per display. |
| 84 mus::mojom::AcceleratorRegistrarPtr registrar; | 84 mus::mojom::AcceleratorRegistrarPtr registrar; |
| 85 shell_->ConnectToService("mojo:desktop_wm", ®istrar); | 85 shell_->ConnectToInterface("mojo:desktop_wm", ®istrar); |
| 86 | 86 |
| 87 if (binding_.is_bound()) | 87 if (binding_.is_bound()) |
| 88 binding_.Unbind(); | 88 binding_.Unbind(); |
| 89 registrar->SetHandler(binding_.CreateInterfacePtrAndBind()); | 89 registrar->SetHandler(binding_.CreateInterfacePtrAndBind()); |
| 90 // If the window manager restarts, the handler pipe will close and we'll need | 90 // If the window manager restarts, the handler pipe will close and we'll need |
| 91 // to re-add our accelerators when the window manager comes back up. | 91 // to re-add our accelerators when the window manager comes back up. |
| 92 binding_.set_connection_error_handler( | 92 binding_.set_connection_error_handler( |
| 93 base::Bind(&BrowserDriverApplicationDelegate::AddAccelerators, | 93 base::Bind(&BrowserDriverApplicationDelegate::AddAccelerators, |
| 94 base::Unretained(this))); | 94 base::Unretained(this))); |
| 95 | 95 |
| 96 for (const AcceleratorSpec& spec : g_spec) { | 96 for (const AcceleratorSpec& spec : g_spec) { |
| 97 registrar->AddAccelerator( | 97 registrar->AddAccelerator( |
| 98 static_cast<uint32_t>(spec.id), | 98 static_cast<uint32_t>(spec.id), |
| 99 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags), | 99 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags), |
| 100 base::Bind(&AssertTrue)); | 100 base::Bind(&AssertTrue)); |
| 101 } | 101 } |
| 102 } | 102 } |
| 103 | 103 |
| 104 } // namespace browser_driver | 104 } // namespace browser_driver |
| 105 } // namespace main | 105 } // namespace main |
| OLD | NEW |