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

Unified Diff: mojo/examples/keyboard/keyboard.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/embedded_app/embedded_app.cc ('k') | mojo/examples/keyboard/keyboard_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/keyboard/keyboard.cc
diff --git a/mojo/examples/keyboard/keyboard.cc b/mojo/examples/keyboard/keyboard.cc
index 9279d22eac74901817f9cbada4e1d649215440a0..8eae68488b5466c114918d2bdd7d29b319733e0c 100644
--- a/mojo/examples/keyboard/keyboard.cc
+++ b/mojo/examples/keyboard/keyboard.cc
@@ -2,7 +2,7 @@
// 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/macros.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "mojo/application/application_runner_chromium.h"
@@ -38,7 +38,7 @@ class KeyboardServiceImpl : public InterfaceImpl<KeyboardService> {
virtual ~KeyboardServiceImpl() {}
// KeyboardService:
- virtual void SetTarget(uint32_t view_id) OVERRIDE;
+ virtual void SetTarget(uint32_t view_id) override;
private:
Keyboard* keyboard_;
@@ -99,20 +99,20 @@ class Keyboard : public ApplicationDelegate,
virtual void OnEmbed(ViewManager* view_manager,
View* root,
ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
+ scoped_ptr<ServiceProvider> imported_services) override {
// TODO: deal with OnEmbed() being invoked multiple times.
view_manager_ = view_manager;
CreateWidget(root);
}
virtual void OnViewManagerDisconnected(
- ViewManager* view_manager) OVERRIDE {
+ ViewManager* view_manager) override {
DCHECK_EQ(view_manager_, view_manager);
view_manager_ = NULL;
base::MessageLoop::current()->Quit();
}
// KeyboardDelegate:
- virtual void OnKeyPressed(int key_code, int event_flags) OVERRIDE {
+ virtual void OnKeyPressed(int key_code, int event_flags) override {
if (!target_)
return;
keyboard_service_->client()->OnKeyboardEvent(target_, key_code,
« no previous file with comments | « mojo/examples/embedded_app/embedded_app.cc ('k') | mojo/examples/keyboard/keyboard_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698