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

Unified Diff: mojo/shell/network_application_loader.h

Issue 619493002: Mojo: Convert OVERRIDE -> override in various subdirectories of mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
Index: mojo/shell/network_application_loader.h
diff --git a/mojo/shell/network_application_loader.h b/mojo/shell/network_application_loader.h
index 9b1ad154dc2ab5a18b9bbbba3bd7ebd86f620528..0f426b0aa62f3529a932c11a2e583a29d007316c 100644
--- a/mojo/shell/network_application_loader.h
+++ b/mojo/shell/network_application_loader.h
@@ -5,9 +5,8 @@
#ifndef MOJO_SHELL_NETWORK_APPLICATION_LOADER_H_
#define MOJO_SHELL_NETWORK_APPLICATION_LOADER_H_
-#include <map>
-
#include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "mojo/application_manager/application_loader.h"
#include "mojo/public/cpp/application/application_delegate.h"
@@ -33,18 +32,18 @@ class NetworkApplicationLoader : 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 void Initialize(ApplicationImpl* app) OVERRIDE;
+ virtual void Initialize(ApplicationImpl* app) override;
virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) OVERRIDE;
+ ApplicationConnection* connection) override;
// InterfaceFactory<NetworkService> overrides.
virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<NetworkService> request) OVERRIDE;
+ InterfaceRequest<NetworkService> request) override;
base::ScopedPtrHashMap<uintptr_t, ApplicationImpl> apps_;
scoped_ptr<NetworkContext> context_;

Powered by Google App Engine
This is Rietveld 408576698