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

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

Issue 1388413005: Move //mojo/services/X/public/... to //mojo/services/X/... (part 1). (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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 | « shell/application_manager/application_manager.cc ('k') | no next file » | 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/converters/url/url_type_converters.h" 7 #include "mojo/converters/url/url_type_converters.h"
8 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 8 #include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
9 #include "shell/application_manager/application_manager.h" 9 #include "shell/application_manager/application_manager.h"
10 10
11 using mojo::ServiceProvider; 11 using mojo::ServiceProvider;
12 using mojo::ServiceProviderPtr; 12 using mojo::ServiceProviderPtr;
13 13
14 namespace shell { 14 namespace shell {
15 15
16 ShellImpl::ShellImpl(mojo::ApplicationPtr application, 16 ShellImpl::ShellImpl(mojo::ApplicationPtr application,
17 ApplicationManager* manager, 17 ApplicationManager* manager,
18 const Identity& identity, 18 const Identity& identity,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 GURL app_gurl(app_url); 53 GURL app_gurl(app_url);
54 if (!app_gurl.is_valid()) { 54 if (!app_gurl.is_valid()) {
55 LOG(ERROR) << "Error: invalid URL: " << app_url; 55 LOG(ERROR) << "Error: invalid URL: " << app_url;
56 return; 56 return;
57 } 57 }
58 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(), 58 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(),
59 exposed_services.Pass(), base::Closure()); 59 exposed_services.Pass(), base::Closure());
60 } 60 }
61 61
62 } // namespace shell 62 } // namespace shell
OLDNEW
« no previous file with comments | « shell/application_manager/application_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698