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

Side by Side Diff: ash/shell/shell_delegate_impl.cc

Issue 14646041: Allow virtual keyboard window to access audio stream and speech api for voice input (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/speech/chrome_speech_recognition_manager_delegate.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/caps_lock_delegate_stub.h" 9 #include "ash/caps_lock_delegate_stub.h"
10 #include "ash/host/root_window_host_factory.h" 10 #include "ash/host/root_window_host_factory.h"
(...skipping 22 matching lines...) Expand all
33 private: 33 private:
34 // Overridden from keyboard::KeyboardControllerProxy: 34 // Overridden from keyboard::KeyboardControllerProxy:
35 virtual content::BrowserContext* GetBrowserContext() OVERRIDE { 35 virtual content::BrowserContext* GetBrowserContext() OVERRIDE {
36 return Shell::GetInstance()->browser_context(); 36 return Shell::GetInstance()->browser_context();
37 } 37 }
38 38
39 virtual ui::InputMethod* GetInputMethod() OVERRIDE { 39 virtual ui::InputMethod* GetInputMethod() OVERRIDE {
40 return Shell::GetInstance()->input_method_filter()->input_method(); 40 return Shell::GetInstance()->input_method_filter()->input_method();
41 } 41 }
42 42
43 virtual void RequestAudioInput(content::WebContents* web_contents,
44 const content::MediaStreamRequest& request,
45 const content::MediaResponseCallback& callback) OVERRIDE {
46 return;
47 }
48
43 DISALLOW_COPY_AND_ASSIGN(DummyKeyboardControllerProxy); 49 DISALLOW_COPY_AND_ASSIGN(DummyKeyboardControllerProxy);
44 }; 50 };
45 51
46 } // namespace 52 } // namespace
47 53
48 namespace shell { 54 namespace shell {
49 55
50 ShellDelegateImpl::ShellDelegateImpl() 56 ShellDelegateImpl::ShellDelegateImpl()
51 : watcher_(NULL), 57 : watcher_(NULL),
52 launcher_delegate_(NULL), 58 launcher_delegate_(NULL),
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() { 249 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() {
244 return RootWindowHostFactory::Create(); 250 return RootWindowHostFactory::Create();
245 } 251 }
246 252
247 base::string16 ShellDelegateImpl::GetProductName() const { 253 base::string16 ShellDelegateImpl::GetProductName() const {
248 return base::string16(); 254 return base::string16();
249 } 255 }
250 256
251 } // namespace shell 257 } // namespace shell
252 } // namespace ash 258 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698