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

Unified Diff: mojo/examples/embedded_app/embedded_app.cc

Issue 623573002: Mojo: Convert the remaining OVERRIDEs to override in 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
« no previous file with comments | « mojo/examples/compositor_app/compositor_host.h ('k') | mojo/examples/keyboard/keyboard.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/embedded_app/embedded_app.cc
diff --git a/mojo/examples/embedded_app/embedded_app.cc b/mojo/examples/embedded_app/embedded_app.cc
index b7239fab17c0bc1070b621f0594936255f56217e..da51faeb8ac35d815949d3dd8df0636a10903e25 100644
--- a/mojo/examples/embedded_app/embedded_app.cc
+++ b/mojo/examples/embedded_app/embedded_app.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/basictypes.h"
#include "base/bind.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_number_conversions.h"
#include "mojo/application/application_runner_chromium.h"
@@ -64,21 +64,21 @@ class EmbeddedApp
virtual void OnEmbed(ViewManager* view_manager,
View* root,
ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
+ scoped_ptr<ServiceProvider> imported_services) override {
root->AddObserver(this);
windows_[root->id()] = new Window(root, imported_services.Pass());
root->SetColor(kColors[next_color_++ % arraysize(kColors)]);
}
- virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {
+ virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {
base::MessageLoop::current()->Quit();
}
// Overridden from ViewObserver:
- virtual void OnViewDestroyed(View* view) OVERRIDE {
+ virtual void OnViewDestroyed(View* view) override {
DCHECK(windows_.find(view->id()) != windows_.end());
windows_.erase(view->id());
}
- virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE {
+ virtual void OnViewInputEvent(View* view, const EventPtr& event) override {
if (event->action == EVENT_TYPE_MOUSE_RELEASED) {
if (event->flags & EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
URLRequestPtr request(URLRequest::New());
« no previous file with comments | « mojo/examples/compositor_app/compositor_host.h ('k') | mojo/examples/keyboard/keyboard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698