ash/mus/app_list_presenter_mus.cc - Issue 2419723002: Move services/shell to services/service_manager

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/mus/app_list_presenter_mus.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « ash/mus/app_launch_unittest.cc ('k') | ash/mus/keyboard_ui_mus.cc » ('j') | no next file with comments »

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 "services/shell/public/cpp/connector.h"	7 #include "services/service_manager/public/cpp/connector.h"

8	8

9 namespace ash {	9 namespace ash {

10	10

11 namespace {	11 namespace {

12	12

13 bool HasConnection(app_list::mojom::AppListPresenterPtr* interface_ptr) {	13 bool HasConnection(app_list::mojom::AppListPresenterPtr* interface_ptr) {

14 return interface_ptr->is_bound() && !interface_ptr->encountered_error();	14 return interface_ptr->is_bound() && !interface_ptr->encountered_error();

15 }	15 }

16	16

17 } // namespace	17 } // namespace

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50	50

51 void AppListPresenterMus::ConnectIfNeeded() {	51 void AppListPresenterMus::ConnectIfNeeded() {

52 if (!connector_ \|\| HasConnection(&presenter_))	52 if (!connector_ \|\| HasConnection(&presenter_))

53 return;	53 return;

54 connector_->ConnectToInterface("service:content_browser", &presenter_);	54 connector_->ConnectToInterface("service:content_browser", &presenter_);

55 CHECK(HasConnection(&presenter_))	55 CHECK(HasConnection(&presenter_))

56 << "Could not connect to app_list::mojom::AppListPresenter.";	56 << "Could not connect to app_list::mojom::AppListPresenter.";

57 }	57 }

58	58

59 } // namespace ash	59 } // namespace ash

OLD	NEW