| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/mus/app_list_presenter_mus.h" | 5 #include "ash/mus/app_list_presenter_mus.h" |
| 6 | 6 |
| 7 #include "content/public/common/service_names.mojom.h" |
| 7 #include "services/service_manager/public/cpp/connector.h" | 8 #include "services/service_manager/public/cpp/connector.h" |
| 8 | 9 |
| 9 namespace ash { | 10 namespace ash { |
| 10 | 11 |
| 11 namespace { | 12 namespace { |
| 12 | 13 |
| 13 bool HasConnection(app_list::mojom::AppListPresenterPtr* interface_ptr) { | 14 bool HasConnection(app_list::mojom::AppListPresenterPtr* interface_ptr) { |
| 14 return interface_ptr->is_bound() && !interface_ptr->encountered_error(); | 15 return interface_ptr->is_bound() && !interface_ptr->encountered_error(); |
| 15 } | 16 } |
| 16 | 17 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 44 // TODO(mfomitchev): we have GetTargetVisibility() in mojom, but this | 45 // TODO(mfomitchev): we have GetTargetVisibility() in mojom, but this |
| 45 // shouldn't be a synchronous method. We should go through the call sites and | 46 // shouldn't be a synchronous method. We should go through the call sites and |
| 46 // either teach them to use a callback, or perhaps use a visibility observer. | 47 // either teach them to use a callback, or perhaps use a visibility observer. |
| 47 // NOTIMPLEMENTED(); | 48 // NOTIMPLEMENTED(); |
| 48 return false; | 49 return false; |
| 49 } | 50 } |
| 50 | 51 |
| 51 void AppListPresenterMus::ConnectIfNeeded() { | 52 void AppListPresenterMus::ConnectIfNeeded() { |
| 52 if (!connector_ || HasConnection(&presenter_)) | 53 if (!connector_ || HasConnection(&presenter_)) |
| 53 return; | 54 return; |
| 54 connector_->ConnectToInterface("content_browser", &presenter_); | 55 connector_->ConnectToInterface(content::mojom::kBrowserServiceName, |
| 56 &presenter_); |
| 55 CHECK(HasConnection(&presenter_)) | 57 CHECK(HasConnection(&presenter_)) |
| 56 << "Could not connect to app_list::mojom::AppListPresenter."; | 58 << "Could not connect to app_list::mojom::AppListPresenter."; |
| 57 } | 59 } |
| 58 | 60 |
| 59 } // namespace ash | 61 } // namespace ash |
| OLD | NEW |