| Index: shell/application_manager/shell_impl.h
|
| diff --git a/shell/application_manager/shell_impl.h b/shell/application_manager/shell_impl.h
|
| index 5f405e5cff8f208af56bd65c0b2d5e200415f2ba..4a57e9b3ba39f19f1e6b634400384b2ac2d29854 100644
|
| --- a/shell/application_manager/shell_impl.h
|
| +++ b/shell/application_manager/shell_impl.h
|
| @@ -9,6 +9,7 @@
|
| #include "mojo/public/cpp/bindings/error_handler.h"
|
| #include "mojo/public/interfaces/application/application.mojom.h"
|
| #include "mojo/public/interfaces/application/shell.mojom.h"
|
| +#include "shell/application_manager/url_and_identity.h"
|
| #include "url/gurl.h"
|
|
|
| namespace mojo {
|
| @@ -22,7 +23,7 @@ class ShellImpl : public Shell, public ErrorHandler {
|
| ApplicationManager* manager,
|
| // The original URL that was first requested, before any resolution.
|
| const GURL& original_url,
|
| - const GURL& resolved_url);
|
| + const URLAndIdentity& resolved_url_and_identity);
|
|
|
| ~ShellImpl() override;
|
|
|
| @@ -34,7 +35,7 @@ class ShellImpl : public Shell, public ErrorHandler {
|
| ServiceProviderPtr exposed_services);
|
|
|
| Application* application() { return application_.get(); }
|
| - const GURL& url() const { return url_; }
|
| + const URLAndIdentity& url_and_identity() const { return url_and_identity_; }
|
| const GURL& requested_url() const { return requested_url_; }
|
|
|
| private:
|
| @@ -48,7 +49,7 @@ class ShellImpl : public Shell, public ErrorHandler {
|
|
|
| ApplicationManager* const manager_;
|
| const GURL requested_url_;
|
| - const GURL url_;
|
| + const URLAndIdentity url_and_identity_;
|
| ApplicationPtr application_;
|
| Binding<Shell> binding_;
|
|
|
|
|