| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 mojo::ApplicationConnection* connection) { | 59 mojo::ApplicationConnection* connection) { |
| 60 return true; | 60 return true; |
| 61 } | 61 } |
| 62 | 62 |
| 63 void BrowserDriverApplicationDelegate::OnAccelerator( | 63 void BrowserDriverApplicationDelegate::OnAccelerator( |
| 64 uint32_t id, mus::mojom::EventPtr event) { | 64 uint32_t id, mus::mojom::EventPtr event) { |
| 65 switch (static_cast<Accelerator>(id)) { | 65 switch (static_cast<Accelerator>(id)) { |
| 66 case Accelerator::NewWindow: | 66 case Accelerator::NewWindow: |
| 67 case Accelerator::NewTab: | 67 case Accelerator::NewTab: |
| 68 case Accelerator::NewIncognitoWindow: | 68 case Accelerator::NewIncognitoWindow: |
| 69 app_->ConnectToApplication("exe:chrome"); | 69 app_->ConnectToApplication("mojo:task_viewer"); |
| 70 // TODO(beng): have Chrome export a service that allows it to be driven by | 70 // TODO(beng): have Chrome export a service that allows it to be driven by |
| 71 // this driver, e.g. to open new tabs, incognito windows, etc. | 71 // this driver, e.g. to open new tabs, incognito windows, etc. |
| 72 break; | 72 break; |
| 73 default: | 73 default: |
| 74 NOTREACHED(); | 74 NOTREACHED(); |
| 75 break; | 75 break; |
| 76 } | 76 } |
| 77 } | 77 } |
| 78 | 78 |
| 79 void BrowserDriverApplicationDelegate::AddAccelerators() { | 79 void BrowserDriverApplicationDelegate::AddAccelerators() { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 94 for (const AcceleratorSpec& spec : g_spec) { | 94 for (const AcceleratorSpec& spec : g_spec) { |
| 95 registrar->AddAccelerator( | 95 registrar->AddAccelerator( |
| 96 static_cast<uint32_t>(spec.id), | 96 static_cast<uint32_t>(spec.id), |
| 97 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags), | 97 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags), |
| 98 base::Bind(&AssertTrue)); | 98 base::Bind(&AssertTrue)); |
| 99 } | 99 } |
| 100 } | 100 } |
| 101 | 101 |
| 102 } // namespace browser_driver | 102 } // namespace browser_driver |
| 103 } // namespace main | 103 } // namespace main |
| OLD | NEW |