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

Unified Diff: mojo/shell/application_manager.h

Issue 1354813002: Revert of Don't use resolved url for instance identity in ApplicationManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/package_manager/package_manager_impl.cc ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/application_manager.h
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index c7ca5dd0a48456aec81a07c3a40b142fe6de43a6..25b23a551bd47e790be290d0daa6d1940dee2f69 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -99,6 +99,14 @@
// Takes the contents of |params| only when it returns true.
bool ConnectToRunningApplication(
scoped_ptr<ConnectToApplicationParams>* params);
+ // |resolved_url| is the URL to load by |loader| (if loader is not null). It
+ // may be different from |(*params)->app_url()| because of mappings and
+ // resolution rules.
+ // Takes the contents of |params| only when it returns true.
+ void ConnectToApplicationWithLoader(
+ scoped_ptr<ConnectToApplicationParams>* params,
+ const GURL& resolved_url,
+ ApplicationLoader* loader);
InterfaceRequest<Application> CreateInstance(
scoped_ptr<ConnectToApplicationParams> params,
« no previous file with comments | « mojo/package_manager/package_manager_impl.cc ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698