| Index: mojo/shell/view_manager_loader.h
|
| diff --git a/mojo/shell/view_manager_loader.h b/mojo/shell/view_manager_loader.h
|
| index 14912473f52c2dd8b0677201d6ea0ddbf8cadb46..83c5f31f506002feeb6ea99c5157610bcbcaa41b 100644
|
| --- a/mojo/shell/view_manager_loader.h
|
| +++ b/mojo/shell/view_manager_loader.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef MOJO_SHELL_VIEW_MANAGER_LOADER_H_
|
| #define MOJO_SHELL_VIEW_MANAGER_LOADER_H_
|
|
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "mojo/application_manager/application_loader.h"
|
| @@ -31,18 +32,18 @@ class ViewManagerLoader : public ApplicationLoader,
|
| // ApplicationLoader overrides:
|
| virtual void Load(ApplicationManager* manager,
|
| const GURL& url,
|
| - scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
|
| + scoped_refptr<LoadCallbacks> callbacks) override;
|
| virtual void OnApplicationError(ApplicationManager* manager,
|
| - const GURL& url) OVERRIDE;
|
| + const GURL& url) override;
|
|
|
| // ApplicationDelegate overrides.
|
| virtual bool ConfigureIncomingConnection(
|
| - mojo::ApplicationConnection* connection) OVERRIDE;
|
| + mojo::ApplicationConnection* connection) override;
|
|
|
| // InterfaceFactory<ViewManagerInitService> overrides.
|
| virtual void Create(
|
| ApplicationConnection* connection,
|
| - InterfaceRequest<ViewManagerInitService> request) OVERRIDE;
|
| + InterfaceRequest<ViewManagerInitService> request) override;
|
|
|
| ScopedVector<Application> apps_;
|
| service::ViewManagerInitServiceContext context_;
|
|
|