| OLD | NEW |
| 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 #include "ui/keyboard/keyboard_controller_proxy.h" | 5 #include "ui/keyboard/keyboard_controller_proxy.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "content/public/browser/site_instance.h" | 9 #include "content/public/browser/site_instance.h" |
| 10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } | 61 } |
| 62 | 62 |
| 63 // Overridden from content::WebContentsDelegate: | 63 // Overridden from content::WebContentsDelegate: |
| 64 virtual void RequestMediaAccessPermission(content::WebContents* web_contents, | 64 virtual void RequestMediaAccessPermission(content::WebContents* web_contents, |
| 65 const content::MediaStreamRequest& request, | 65 const content::MediaStreamRequest& request, |
| 66 const content::MediaResponseCallback& callback) OVERRIDE { | 66 const content::MediaResponseCallback& callback) OVERRIDE { |
| 67 proxy_->RequestAudioInput(web_contents, request, callback); | 67 proxy_->RequestAudioInput(web_contents, request, callback); |
| 68 } | 68 } |
| 69 | 69 |
| 70 // Overridden from content::WebContentsObserver: | 70 // Overridden from content::WebContentsObserver: |
| 71 virtual void WebContentsDestroyed(content::WebContents* contents) OVERRIDE { | 71 virtual void WebContentsDestroyed() OVERRIDE { |
| 72 delete this; | 72 delete this; |
| 73 } | 73 } |
| 74 | 74 |
| 75 keyboard::KeyboardControllerProxy* proxy_; | 75 keyboard::KeyboardControllerProxy* proxy_; |
| 76 | 76 |
| 77 DISALLOW_COPY_AND_ASSIGN(KeyboardContentsDelegate); | 77 DISALLOW_COPY_AND_ASSIGN(KeyboardContentsDelegate); |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 } // namespace | 80 } // namespace |
| 81 | 81 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 DCHECK(keyboard_contents_); | 157 DCHECK(keyboard_contents_); |
| 158 if (keyboard_contents_->GetURL() != GetVirtualKeyboardUrl()) { | 158 if (keyboard_contents_->GetURL() != GetVirtualKeyboardUrl()) { |
| 159 LoadContents(GetVirtualKeyboardUrl()); | 159 LoadContents(GetVirtualKeyboardUrl()); |
| 160 } | 160 } |
| 161 } | 161 } |
| 162 | 162 |
| 163 void KeyboardControllerProxy::SetupWebContents(content::WebContents* contents) { | 163 void KeyboardControllerProxy::SetupWebContents(content::WebContents* contents) { |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace keyboard | 166 } // namespace keyboard |
| OLD | NEW |