| Index: ui/keyboard/keyboard_controller_proxy.cc
|
| diff --git a/ui/keyboard/keyboard_controller_proxy.cc b/ui/keyboard/keyboard_controller_proxy.cc
|
| index cd98f9a290ec26c6c1097fa631b85dc61ebc4f29..37f655dc44cbd3bec763b5caaa926704434e5d6c 100644
|
| --- a/ui/keyboard/keyboard_controller_proxy.cc
|
| +++ b/ui/keyboard/keyboard_controller_proxy.cc
|
| @@ -37,7 +37,7 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate,
|
| // Overridden from content::WebContentsDelegate:
|
| virtual content::WebContents* OpenURLFromTab(
|
| content::WebContents* source,
|
| - const content::OpenURLParams& params) OVERRIDE {
|
| + const content::OpenURLParams& params) override {
|
| source->GetController().LoadURL(
|
| params.url, params.referrer, params.transition, params.extra_headers);
|
| Observe(source);
|
| @@ -45,12 +45,12 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate,
|
| }
|
|
|
| virtual bool IsPopupOrPanel(
|
| - const content::WebContents* source) const OVERRIDE {
|
| + const content::WebContents* source) const override {
|
| return true;
|
| }
|
|
|
| virtual void MoveContents(content::WebContents* source,
|
| - const gfx::Rect& pos) OVERRIDE {
|
| + 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
|
| @@ -70,12 +70,12 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate,
|
| // Overridden from content::WebContentsDelegate:
|
| virtual void RequestMediaAccessPermission(content::WebContents* web_contents,
|
| const content::MediaStreamRequest& request,
|
| - const content::MediaResponseCallback& callback) OVERRIDE {
|
| + const content::MediaResponseCallback& callback) override {
|
| proxy_->RequestAudioInput(web_contents, request, callback);
|
| }
|
|
|
| // Overridden from content::WebContentsObserver:
|
| - virtual void WebContentsDestroyed() OVERRIDE {
|
| + virtual void WebContentsDestroyed() override {
|
| delete this;
|
| }
|
|
|
|
|