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

Side by Side Diff: chrome/browser/ui/ash/ash_keyboard_controller_proxy.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
6 #define CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_ 6 #define CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/web_contents_observer.h" 10 #include "content/public/browser/web_contents_observer.h"
(...skipping 21 matching lines...) Expand all
32 public content::WebContentsObserver, 32 public content::WebContentsObserver,
33 public extensions::ExtensionFunctionDispatcher::Delegate { 33 public extensions::ExtensionFunctionDispatcher::Delegate {
34 public: 34 public:
35 AshKeyboardControllerProxy(); 35 AshKeyboardControllerProxy();
36 virtual ~AshKeyboardControllerProxy(); 36 virtual ~AshKeyboardControllerProxy();
37 37
38 private: 38 private:
39 void OnRequest(const ExtensionHostMsg_Request_Params& params); 39 void OnRequest(const ExtensionHostMsg_Request_Params& params);
40 40
41 // keyboard::KeyboardControllerProxy overrides 41 // keyboard::KeyboardControllerProxy overrides
42 virtual content::BrowserContext* GetBrowserContext() OVERRIDE; 42 virtual content::BrowserContext* GetBrowserContext() override;
43 virtual ui::InputMethod* GetInputMethod() OVERRIDE; 43 virtual ui::InputMethod* GetInputMethod() override;
44 virtual void RequestAudioInput(content::WebContents* web_contents, 44 virtual void RequestAudioInput(content::WebContents* web_contents,
45 const content::MediaStreamRequest& request, 45 const content::MediaStreamRequest& request,
46 const content::MediaResponseCallback& callback) OVERRIDE; 46 const content::MediaResponseCallback& callback) override;
47 virtual void SetupWebContents(content::WebContents* contents) OVERRIDE; 47 virtual void SetupWebContents(content::WebContents* contents) override;
48 virtual void ShowKeyboardContainer(aura::Window* container) OVERRIDE; 48 virtual void ShowKeyboardContainer(aura::Window* container) override;
49 49
50 // The overridden implementation dispatches 50 // The overridden implementation dispatches
51 // chrome.virtualKeyboardPrivate.onTextInputBoxFocused event to extension to 51 // chrome.virtualKeyboardPrivate.onTextInputBoxFocused event to extension to
52 // provide the input type information. Naturally, when the virtual keyboard 52 // provide the input type information. Naturally, when the virtual keyboard
53 // extension is used as an IME then chrome.input.ime.onFocus provides the 53 // extension is used as an IME then chrome.input.ime.onFocus provides the
54 // information, but not when the virtual keyboard is used in conjunction with 54 // information, but not when the virtual keyboard is used in conjunction with
55 // another IME. virtualKeyboardPrivate.onTextInputBoxFocused is the remedy in 55 // another IME. virtualKeyboardPrivate.onTextInputBoxFocused is the remedy in
56 // that case. 56 // that case.
57 virtual void SetUpdateInputType(ui::TextInputType type) OVERRIDE; 57 virtual void SetUpdateInputType(ui::TextInputType type) override;
58 58
59 // extensions::ExtensionFunctionDispatcher::Delegate overrides 59 // extensions::ExtensionFunctionDispatcher::Delegate overrides
60 virtual extensions::WindowController* GetExtensionWindowController() const 60 virtual extensions::WindowController* GetExtensionWindowController() const
61 OVERRIDE; 61 override;
62 virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; 62 virtual content::WebContents* GetAssociatedWebContents() const override;
63 63
64 // content::WebContentsObserver overrides 64 // content::WebContentsObserver overrides
65 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 65 virtual bool OnMessageReceived(const IPC::Message& message) override;
66 66
67 scoped_ptr<extensions::ExtensionFunctionDispatcher> 67 scoped_ptr<extensions::ExtensionFunctionDispatcher>
68 extension_function_dispatcher_; 68 extension_function_dispatcher_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(AshKeyboardControllerProxy); 70 DISALLOW_COPY_AND_ASSIGN(AshKeyboardControllerProxy);
71 }; 71 };
72 72
73 #endif // CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_ 73 #endif // CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/app_sync_ui_state_factory.h ('k') | chrome/browser/ui/ash/chrome_new_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698