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

Unified Diff: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « athena/util/fill_layout_manager.h ('k') | athena/wm/bezel_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
diff --git a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
index 7a9fdf683fbf33c338fb6af229c6945d8e35a407..70b0630fb477b33ebfe4594e58db887c40ad69b9 100644
--- a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
+++ b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
@@ -35,7 +35,7 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
virtual ~BasicKeyboardControllerProxy() {}
// keyboard::KeyboardControllerProxy:
- virtual ui::InputMethod* GetInputMethod() OVERRIDE {
+ virtual ui::InputMethod* GetInputMethod() override {
ui::InputMethod* input_method =
root_window_->GetProperty(aura::client::kRootWindowInputMethodKey);
return input_method;
@@ -44,13 +44,13 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
virtual void RequestAudioInput(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback) OVERRIDE {}
+ const content::MediaResponseCallback& callback) override {}
- virtual content::BrowserContext* GetBrowserContext() OVERRIDE {
+ virtual content::BrowserContext* GetBrowserContext() override {
return browser_context_;
}
- virtual void SetUpdateInputType(ui::TextInputType type) OVERRIDE {}
+ virtual void SetUpdateInputType(ui::TextInputType type) override {}
private:
content::BrowserContext* browser_context_;
« no previous file with comments | « athena/util/fill_layout_manager.h ('k') | athena/wm/bezel_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698