chrome/browser/speech/extension_api/tts_extension_api_controller.cc - Issue 11232066: Remove GetExtensionEventRouter from Profile.

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: chrome/browser/speech/extension_api/tts_extension_api_controller.cc

Issue 11232066: Remove GetExtensionEventRouter from Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rerebase Created 8 years, 2 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 | « chrome/browser/speech/extension_api/tts_engine_extension_api.cc ('k') | chrome/browser/speech/speech_input_extension_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/speech/extension_api/tts_extension_api_controller.cc

diff --git a/chrome/browser/speech/extension_api/tts_extension_api_controller.cc b/chrome/browser/speech/extension_api/tts_extension_api_controller.cc

index b54318cf5983cbe985e8f4d09ad9c2d1b3cdbeb7..fdbd57ebf36ffbbeebf2e404bd471af62d97fd1f 100644

--- a/chrome/browser/speech/extension_api/tts_extension_api_controller.cc

+++ b/chrome/browser/speech/extension_api/tts_extension_api_controller.cc

@@ -11,6 +11,7 @@

#include "base/json/json_writer.h"

#include "base/values.h"

#include "chrome/browser/extensions/event_router.h"

+#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/speech/extension_api/tts_extension_api.h"

#include "chrome/browser/speech/extension_api/tts_extension_api_constants.h"

@@ -121,12 +122,9 @@ void Utterance::OnTtsEvent(TtsEventType event_type,

scoped_ptr<ListValue> arguments(new ListValue());

arguments->Set(0, event);

- profile_->GetExtensionEventRouter()->DispatchEventToExtension(

- src_extension_id_,

- events::kOnEvent,

- arguments.Pass(),

- profile_,

- src_url_);

+ extensions::ExtensionSystem::Get(profile_)->event_router()->

+ DispatchEventToExtension(src_extension_id_, events::kOnEvent,

+ arguments.Pass(), profile_, src_url_);

}

void Utterance::Finish() {