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

Side by Side Diff: ash/shell/keyboard_controller_proxy_stub.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 | « ash/shell/context_menu.h ('k') | ash/shell/lock_view.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ 5 #ifndef ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
6 #define ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ 6 #define ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
7 7
8 #include "ui/aura/test/test_window_delegate.h" 8 #include "ui/aura/test/test_window_delegate.h"
9 #include "ui/keyboard/keyboard_controller_proxy.h" 9 #include "ui/keyboard/keyboard_controller_proxy.h"
10 10
11 namespace aura { 11 namespace aura {
12 class Window; 12 class Window;
13 } // namespace aura 13 } // namespace aura
14 14
15 namespace ash { 15 namespace ash {
16 16
17 // Stub implementation of KeyboardControllerProxy 17 // Stub implementation of KeyboardControllerProxy
18 class KeyboardControllerProxyStub : public keyboard::KeyboardControllerProxy { 18 class KeyboardControllerProxyStub : public keyboard::KeyboardControllerProxy {
19 public: 19 public:
20 KeyboardControllerProxyStub(); 20 KeyboardControllerProxyStub();
21 virtual ~KeyboardControllerProxyStub(); 21 virtual ~KeyboardControllerProxyStub();
22 22
23 virtual bool HasKeyboardWindow() const OVERRIDE; 23 virtual bool HasKeyboardWindow() const override;
24 virtual aura::Window* GetKeyboardWindow() OVERRIDE; 24 virtual aura::Window* GetKeyboardWindow() override;
25 25
26 private: 26 private:
27 // Overridden from keyboard::KeyboardControllerProxy: 27 // Overridden from keyboard::KeyboardControllerProxy:
28 virtual content::BrowserContext* GetBrowserContext() OVERRIDE; 28 virtual content::BrowserContext* GetBrowserContext() override;
29 virtual ui::InputMethod* GetInputMethod() OVERRIDE; 29 virtual ui::InputMethod* GetInputMethod() override;
30 virtual void RequestAudioInput(content::WebContents* web_contents, 30 virtual void RequestAudioInput(content::WebContents* web_contents,
31 const content::MediaStreamRequest& request, 31 const content::MediaStreamRequest& request,
32 const content::MediaResponseCallback& callback) OVERRIDE; 32 const content::MediaResponseCallback& callback) override;
33 virtual void LoadSystemKeyboard() OVERRIDE; 33 virtual void LoadSystemKeyboard() override;
34 virtual void ReloadKeyboardIfNeeded() OVERRIDE; 34 virtual void ReloadKeyboardIfNeeded() override;
35 35
36 aura::test::TestWindowDelegate delegate_; 36 aura::test::TestWindowDelegate delegate_;
37 scoped_ptr<aura::Window> keyboard_; 37 scoped_ptr<aura::Window> keyboard_;
38 DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub); 38 DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub);
39 }; 39 };
40 40
41 } // namespace ash 41 } // namespace ash
42 42
43 #endif // ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_ 43 #endif // ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
OLDNEW
« no previous file with comments | « ash/shell/context_menu.h ('k') | ash/shell/lock_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698