Index: shell/application_manager/application_manager.cc |
diff --git a/shell/application_manager/application_manager.cc b/shell/application_manager/application_manager.cc |
index 85a6f329774f14cf2961136efc93d7a21401fc78..4973827f959919aca466475aa10c986e0b632486 100644 |
--- a/shell/application_manager/application_manager.cc |
+++ b/shell/application_manager/application_manager.cc |
@@ -47,17 +47,6 @@ std::vector<std::string> Concatenate(const std::vector<std::string>& v1, |
} // namespace |
-ApplicationManager::Delegate::~Delegate() { |
-} |
- |
-GURL ApplicationManager::Delegate::ResolveURL(const GURL& url) { |
- return url; |
-} |
- |
-GURL ApplicationManager::Delegate::ResolveMappings(const GURL& url) { |
- return url; |
-} |
- |
class ApplicationManager::ContentHandlerConnection : public mojo::ErrorHandler { |
public: |
ContentHandlerConnection(ApplicationManager* manager, |
@@ -153,7 +142,7 @@ void ApplicationManager::ConnectToApplicationWithParameters( |
return; |
} |
- GURL resolved_url = delegate_->ResolveURL(mapped_url); |
+ GURL resolved_url = delegate_->ResolveMojoURL(mapped_url); |
if (ConnectToRunningApplication(resolved_url, requestor_url, &services, |
&exposed_services)) { |
return; |
@@ -433,7 +422,7 @@ void ApplicationManager::SetArgsForURL(const std::vector<std::string>& args, |
url_to_args_[mapped_url].insert(url_to_args_[mapped_url].end(), |
args.begin(), args.end()); |
} |
- GURL resolved_url = delegate_->ResolveURL(mapped_url); |
+ GURL resolved_url = delegate_->ResolveMojoURL(mapped_url); |
if (resolved_url != mapped_url) { |
url_to_args_[resolved_url].insert(url_to_args_[resolved_url].end(), |
args.begin(), args.end()); |
@@ -445,7 +434,8 @@ void ApplicationManager::SetNativeOptionsForURL( |
const GURL& url) { |
DCHECK(!url.has_query()); // Precondition. |
// Apply mappings and resolution to get the resolved URL. |
- GURL resolved_url = delegate_->ResolveURL(delegate_->ResolveMappings(url)); |
+ GURL resolved_url = |
+ delegate_->ResolveMojoURL(delegate_->ResolveMappings(url)); |
DCHECK(!resolved_url.has_query()); // Still shouldn't have query. |
// TODO(vtl): We should probably also remove/disregard the query string (and |
// maybe canonicalize in other ways). |