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

Side by Side Diff: mojo/application_manager/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, 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 unified diff | Download patch
« no previous file with comments | « no previous file | mojo/application_manager/application_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_ 5 #ifndef MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_
6 #define MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_ 6 #define MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "mojo/application_manager/application_manager_export.h" 9 #include "mojo/application_manager/application_manager_export.h"
10 #include "mojo/public/cpp/system/core.h" 10 #include "mojo/public/cpp/system/core.h"
(...skipping 29 matching lines...) Expand all
40 friend base::RefCounted<LoadCallbacks>; 40 friend base::RefCounted<LoadCallbacks>;
41 virtual ~LoadCallbacks() {} 41 virtual ~LoadCallbacks() {}
42 }; 42 };
43 43
44 // Implements RegisterApplication() by returning a handle that was specified 44 // Implements RegisterApplication() by returning a handle that was specified
45 // at construction time. LoadWithContentHandler() is not supported. 45 // at construction time. LoadWithContentHandler() is not supported.
46 class MOJO_APPLICATION_MANAGER_EXPORT SimpleLoadCallbacks 46 class MOJO_APPLICATION_MANAGER_EXPORT SimpleLoadCallbacks
47 : public LoadCallbacks { 47 : public LoadCallbacks {
48 public: 48 public:
49 SimpleLoadCallbacks(ScopedMessagePipeHandle shell_handle); 49 SimpleLoadCallbacks(ScopedMessagePipeHandle shell_handle);
50 virtual ScopedMessagePipeHandle RegisterApplication() OVERRIDE; 50 virtual ScopedMessagePipeHandle RegisterApplication() override;
danakj 2014/10/01 22:38:32 wasn't the rule to not use "virtual" when using "o
51 virtual void LoadWithContentHandler(const GURL& content_handler_url, 51 virtual void LoadWithContentHandler(const GURL& content_handler_url,
52 URLResponsePtr response) OVERRIDE; 52 URLResponsePtr response) override;
53 53
54 private: 54 private:
55 ScopedMessagePipeHandle shell_handle_; 55 ScopedMessagePipeHandle shell_handle_;
56 virtual ~SimpleLoadCallbacks(); 56 virtual ~SimpleLoadCallbacks();
57 }; 57 };
58 58
59 virtual ~ApplicationLoader() {} 59 virtual ~ApplicationLoader() {}
60 60
61 // Load the application named |url|. Applications can be loaded two ways: 61 // Load the application named |url|. Applications can be loaded two ways:
62 // 62 //
(...skipping 16 matching lines...) Expand all
79 virtual void OnApplicationError(ApplicationManager* manager, 79 virtual void OnApplicationError(ApplicationManager* manager,
80 const GURL& url) = 0; 80 const GURL& url) = 0;
81 81
82 protected: 82 protected:
83 ApplicationLoader() {} 83 ApplicationLoader() {}
84 }; 84 };
85 85
86 } // namespace mojo 86 } // namespace mojo
87 87
88 #endif // MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_ 88 #endif // MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_
OLDNEW
« no previous file with comments | « no previous file | mojo/application_manager/application_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698