content/browser/speech/speech_input_dispatcher_host.cc - Issue 7729001: Get rid of link dependency from content to chrome. Make it get the SpeechInputManager through the...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/speech/speech_input_dispatcher_host.cc

Issue 7729001: Get rid of link dependency from content to chrome. Make it get the SpeechInputManager through the... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/speech/speech_input_dispatcher_host.h ('k') | content/browser/speech/speech_input_manager.h » ('j') | content/browser/speech/speech_input_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/speech/speech_input_dispatcher_host.cc

===================================================================

--- content/browser/speech/speech_input_dispatcher_host.cc (revision 98061)

+++ content/browser/speech/speech_input_dispatcher_host.cc (working copy)

@@ -5,6 +5,7 @@

#include "content/browser/speech/speech_input_dispatcher_host.h"

#include "base/lazy_instance.h"

+#include "content/browser/content_browser_client.h"

#include "content/common/speech_input_messages.h"

namespace speech_input {

@@ -101,8 +102,7 @@

//-------------------------- SpeechInputDispatcherHost -------------------------

-SpeechInputManager::AccessorMethod*

- SpeechInputDispatcherHost::manager_accessor_ = &SpeechInputManager::Get;

+SpeechInputManager* SpeechInputDispatcherHost::manager_;

SpeechInputDispatcherHost::SpeechInputDispatcherHost(int render_process_id)

: render_process_id_(render_process_id),

@@ -123,7 +123,9 @@

}

SpeechInputManager* SpeechInputDispatcherHost::manager() {

- return (*manager_accessor_)();

+ if (manager_)

+ return manager_;

+ return content::GetContentClient()->browser()->GetSpeechInputManager();

}

bool SpeechInputDispatcherHost::OnMessageReceived(