diff options
Diffstat (limited to 'ui/keyboard/keyboard_controller_proxy.cc')
-rw-r--r-- | ui/keyboard/keyboard_controller_proxy.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ui/keyboard/keyboard_controller_proxy.cc b/ui/keyboard/keyboard_controller_proxy.cc index 37f655d..6a28869 100644 --- a/ui/keyboard/keyboard_controller_proxy.cc +++ b/ui/keyboard/keyboard_controller_proxy.cc @@ -31,11 +31,11 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate, public: KeyboardContentsDelegate(keyboard::KeyboardControllerProxy* proxy) : proxy_(proxy) {} - virtual ~KeyboardContentsDelegate() {} + ~KeyboardContentsDelegate() override {} private: // Overridden from content::WebContentsDelegate: - virtual content::WebContents* OpenURLFromTab( + content::WebContents* OpenURLFromTab( content::WebContents* source, const content::OpenURLParams& params) override { source->GetController().LoadURL( @@ -44,13 +44,12 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate, return source; } - virtual bool IsPopupOrPanel( - const content::WebContents* source) const override { + bool IsPopupOrPanel(const content::WebContents* source) const override { return true; } - virtual void MoveContents(content::WebContents* source, - const gfx::Rect& pos) override { + void MoveContents(content::WebContents* source, + const gfx::Rect& pos) override { aura::Window* keyboard = proxy_->GetKeyboardWindow(); // keyboard window must have been added to keyboard container window at this // point. Otherwise, wrong keyboard bounds is used and may cause problem as @@ -68,16 +67,15 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate, } // Overridden from content::WebContentsDelegate: - virtual void RequestMediaAccessPermission(content::WebContents* web_contents, + void RequestMediaAccessPermission( + content::WebContents* web_contents, const content::MediaStreamRequest& request, const content::MediaResponseCallback& callback) override { proxy_->RequestAudioInput(web_contents, request, callback); } // Overridden from content::WebContentsObserver: - virtual void WebContentsDestroyed() override { - delete this; - } + void WebContentsDestroyed() override { delete this; } keyboard::KeyboardControllerProxy* proxy_; |