Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(550)

Side by Side Diff: shell/application_manager/shell_impl.cc

Issue 983113002: ApplicationManager: Use callback to get notified on application shutdown. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase after parameters fix Created 5 years, 9 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 | « shell/application_manager/shell_impl.h ('k') | shell/context.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "shell/application_manager/shell_impl.h" 5 #include "shell/application_manager/shell_impl.h"
6 6
7 #include "mojo/common/common_type_converters.h" 7 #include "mojo/common/common_type_converters.h"
8 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 8 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
9 #include "shell/application_manager/application_manager.h" 9 #include "shell/application_manager/application_manager.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 namespace shell { 12 namespace shell {
13 13
14 ShellImpl::ShellImpl(ApplicationPtr application, 14 ShellImpl::ShellImpl(ApplicationPtr application,
15 ApplicationManager* manager, 15 ApplicationManager* manager,
16 const GURL& requested_url, 16 const Identity& identity,
17 const Identity& identity) 17 const base::Closure& on_application_end)
18 : manager_(manager), 18 : manager_(manager),
19 requested_url_(requested_url),
20 identity_(identity), 19 identity_(identity),
20 on_application_end_(on_application_end),
21 application_(application.Pass()), 21 application_(application.Pass()),
22 binding_(this) { 22 binding_(this) {
23 binding_.set_error_handler(this); 23 binding_.set_error_handler(this);
24 } 24 }
25 25
26 ShellImpl::~ShellImpl() { 26 ShellImpl::~ShellImpl() {
27 } 27 }
28 28
29 void ShellImpl::InitializeApplication(Array<String> args) { 29 void ShellImpl::InitializeApplication(Array<String> args) {
30 ShellPtr shell; 30 ShellPtr shell;
(...skipping 12 matching lines...) Expand all
43 // Shell implementation: 43 // Shell implementation:
44 void ShellImpl::ConnectToApplication(const String& app_url, 44 void ShellImpl::ConnectToApplication(const String& app_url,
45 InterfaceRequest<ServiceProvider> services, 45 InterfaceRequest<ServiceProvider> services,
46 ServiceProviderPtr exposed_services) { 46 ServiceProviderPtr exposed_services) {
47 GURL app_gurl(app_url); 47 GURL app_gurl(app_url);
48 if (!app_gurl.is_valid()) { 48 if (!app_gurl.is_valid()) {
49 LOG(ERROR) << "Error: invalid URL: " << app_url; 49 LOG(ERROR) << "Error: invalid URL: " << app_url;
50 return; 50 return;
51 } 51 }
52 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(), 52 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(),
53 exposed_services.Pass()); 53 exposed_services.Pass(), base::Closure());
54 } 54 }
55 55
56 void ShellImpl::OnConnectionError() { 56 void ShellImpl::OnConnectionError() {
57 manager_->OnShellImplError(this); 57 manager_->OnShellImplError(this);
58 } 58 }
59 59
60 } // namespace shell 60 } // namespace shell
61 } // namespace mojo 61 } // namespace mojo
OLDNEW
« no previous file with comments | « shell/application_manager/shell_impl.h ('k') | shell/context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698