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

Unified Diff: mojo/application_manager/application_manager.cc

Issue 668663006: Standardize usage of virtual/override/final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/application_manager/application_manager.cc
diff --git a/mojo/application_manager/application_manager.cc b/mojo/application_manager/application_manager.cc
index 38ee97279d5091d6ed1659da2c8f08b2a9bbcdd4..75ef7a76694b24773a65b38e644d83bd901d1ce9 100644
--- a/mojo/application_manager/application_manager.cc
+++ b/mojo/application_manager/application_manager.cc
@@ -29,9 +29,8 @@ class StubServiceProvider : public InterfaceImpl<ServiceProvider> {
ServiceProvider* GetRemoteServiceProvider() { return client(); }
private:
- virtual void ConnectToService(
- const String& service_name,
- ScopedMessagePipeHandle client_handle) override {}
+ void ConnectToService(const String& service_name,
+ ScopedMessagePipeHandle client_handle) override {}
};
} // namespace
@@ -51,10 +50,10 @@ class ApplicationManager::LoadCallbacksImpl
service_provider_(service_provider.Pass()) {}
private:
- virtual ~LoadCallbacksImpl() {}
+ ~LoadCallbacksImpl() override {}
// LoadCallbacks implementation
- virtual ScopedMessagePipeHandle RegisterApplication() override {
+ ScopedMessagePipeHandle RegisterApplication() override {
ScopedMessagePipeHandle shell_handle;
if (manager_) {
manager_->RegisterLoadedApplication(requested_url_,
@@ -65,8 +64,8 @@ class ApplicationManager::LoadCallbacksImpl
return shell_handle.Pass();
}
- virtual void LoadWithContentHandler(const GURL& content_handler_url,
- URLResponsePtr url_response) override {
+ void LoadWithContentHandler(const GURL& content_handler_url,
+ URLResponsePtr url_response) override {
if (manager_) {
manager_->LoadWithContentHandler(requested_url_,
requestor_url_,
@@ -87,7 +86,7 @@ class ApplicationManager::ShellImpl : public InterfaceImpl<Shell> {
ShellImpl(ApplicationManager* manager, const GURL& url)
: manager_(manager), url_(url) {}
- virtual ~ShellImpl() {}
+ ~ShellImpl() override {}
void ConnectToClient(const GURL& requestor_url,
ServiceProviderPtr service_provider) {
@@ -96,7 +95,7 @@ class ApplicationManager::ShellImpl : public InterfaceImpl<Shell> {
}
// ServiceProvider implementation:
- virtual void ConnectToApplication(
+ void ConnectToApplication(
const String& app_url,
InterfaceRequest<ServiceProvider> in_service_provider) override {
ServiceProviderPtr out_service_provider;
@@ -108,9 +107,7 @@ class ApplicationManager::ShellImpl : public InterfaceImpl<Shell> {
const GURL& url() const { return url_; }
private:
- virtual void OnConnectionError() override {
- manager_->OnShellImplError(this);
- }
+ void OnConnectionError() override { manager_->OnShellImplError(this); }
ApplicationManager* const manager_;
const GURL url_;
« no previous file with comments | « mojo/application_manager/application_loader.h ('k') | mojo/application_manager/application_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698