Index: mojo/shell/package_manager.h |
diff --git a/mojo/shell/package_manager.h b/mojo/shell/package_manager.h |
index ffd84cdbea2374b5c94aae9b65e4f423c5b3edaa..1b46164c31d2adee175ce6688f05af08a48c96ad 100644 |
--- a/mojo/shell/package_manager.h |
+++ b/mojo/shell/package_manager.h |
@@ -16,7 +16,7 @@ namespace shell { |
class ApplicationManager; |
// A class implementing this interface assists Shell::ConnectToApplication in |
-// resolving URLs and fetching the applications located therein. |
+// fetching the applications located therein. |
class PackageManager { |
public: |
PackageManager() {} |
@@ -26,12 +26,7 @@ class PackageManager { |
// associated ApplicationManager. |
virtual void SetApplicationManager(ApplicationManager* manager) = 0; |
- // Resolves |url| to its canonical form. e.g. for mojo: urls, returns a file: |
- // url with a path ending in .mojo. |
- virtual GURL ResolveURL(const GURL& url) = 0; |
- |
- // Asks the delegate to fetch the specified url. |url| must be unresolved, |
- // i.e. ResolveURL() above must not have been called on it. |
+ // Asks the delegate to fetch the specified url. |
// TODO(beng): figure out how not to expose Fetcher at all at this layer. |
virtual void FetchRequest( |
URLRequestPtr request, |
@@ -39,8 +34,7 @@ class PackageManager { |
// Determine if a content handler should handle the response received by |
// |fetcher|. |
- // |unresolved_url| is the url requested initially by a call to |
- // Shell::ConnectToApplication() before any resolution is applied. |
+ // |url| is the url requested initially by a call to ConnectToApplication(). |
// |task_runner| is a base::TaskRunner* that can be used to post callbacks. |
// |new_response| is the response that should be passed to |
// ContentHandler::StartApplication(), unchanged if the return value is false. |
@@ -49,7 +43,7 @@ class PackageManager { |
// |qualifier| is the Identity qualifier that the content handler application |
// instance should be associated with, unchanged if the return value is false. |
virtual bool HandleWithContentHandler(Fetcher* fetcher, |
- const GURL& unresolved_url, |
+ const GURL& url, |
base::TaskRunner* task_runner, |
URLResponsePtr* new_response, |
GURL* content_handler_url, |