mojo/shell/shell_impl.cc - Issue 1091513005: Separate mojo/shell into a runner and the application manager (shell)

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: mojo/shell/shell_impl.cc

Issue 1091513005: Separate mojo/shell into a runner and the application manager (shell) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 8 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 | « mojo/shell/shell_impl.h ('k') | mojo/shell/shell_test_base.h » ('j') | no next file with comments »

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 "mojo/shell/application_manager/shell_impl.h"	5 #include "mojo/shell/shell_impl.h"

6	6

7 #include "mojo/common/common_type_converters.h"	7 #include "mojo/common/common_type_converters.h"

8 #include "mojo/common/url_type_converters.h"	8 #include "mojo/common/url_type_converters.h"

9 #include "mojo/shell/application_manager/application_manager.h"	9 #include "mojo/shell/application_manager.h"

10 #include "third_party/mojo_services/src/content_handler/public/interfaces/conten t_handler.mojom.h"	10 #include "third_party/mojo_services/src/content_handler/public/interfaces/conten t_handler.mojom.h"

11	11

12 namespace mojo {	12 namespace mojo {

13 namespace shell {	13 namespace shell {

14	14

15 ShellImpl::ShellImpl(ApplicationPtr application,	15 ShellImpl::ShellImpl(ApplicationPtr application,

16 ApplicationManager* manager,	16 ApplicationManager* manager,

17 const Identity& identity,	17 const Identity& identity,

18 const base::Closure& on_application_end)	18 const base::Closure& on_application_end)

19 : manager_(manager),	19 : manager_(manager),

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(),	53 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(),

54 exposed_services.Pass(), base::Closure());	54 exposed_services.Pass(), base::Closure());

55 }	55 }

56	56

57 void ShellImpl::OnConnectionError() {	57 void ShellImpl::OnConnectionError() {

58 manager_->OnShellImplError(this);	58 manager_->OnShellImplError(this);

59 }	59 }

60	60

61 } // namespace shell	61 } // namespace shell

62 } // namespace mojo	62 } // namespace mojo

OLD	NEW