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

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

Issue 814273005: Move application_manager from /mojo to /shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Update include guards. Created 5 years, 11 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/application_manager/test.mojom » ('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 "mojo/application_manager/shell_impl.h" 5 #include "shell/application_manager/shell_impl.h"
6 6
7 #include "mojo/application_manager/application_manager.h"
8 #include "mojo/common/common_type_converters.h" 7 #include "mojo/common/common_type_converters.h"
9 #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"
10 10
11 namespace mojo { 11 namespace mojo {
12 12
13 ShellImpl::ShellImpl(ScopedMessagePipeHandle handle, 13 ShellImpl::ShellImpl(ScopedMessagePipeHandle handle,
14 ApplicationManager* manager, 14 ApplicationManager* manager,
15 const GURL& requested_url, 15 const GURL& requested_url,
16 const GURL& url) 16 const GURL& url)
17 : ShellImpl(manager, requested_url, url) { 17 : ShellImpl(manager, requested_url, url) {
18 binding_.Bind(handle.Pass()); 18 binding_.Bind(handle.Pass());
19 } 19 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 manager_->ConnectToApplication(app_gurl, url_, services.Pass(), 58 manager_->ConnectToApplication(app_gurl, url_, services.Pass(),
59 exposed_services.Pass()); 59 exposed_services.Pass());
60 } 60 }
61 61
62 void ShellImpl::OnConnectionError() { 62 void ShellImpl::OnConnectionError() {
63 manager_->OnShellImplError(this); 63 manager_->OnShellImplError(this);
64 } 64 }
65 65
66 } // namespace mojo 66 } // namespace mojo
OLDNEW
« no previous file with comments | « shell/application_manager/shell_impl.h ('k') | shell/application_manager/test.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698