chrome/browser/speech/extension_api/tts_engine_extension_api.cc - Issue 10696208: Move ExtensionEventRouter and related into extensions namespace

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_engine_extension_api.cc

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed bug + latest master Created 8 years, 5 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/renderer_host/chrome_render_message_filter.cc ('k') | chrome/browser/speech/extension_api/tts_extension_api_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 711880e877b94adef62980c433fe28ad3a0ec1ad..2774e50da019c1a20afdc56714e5e49081b07d5c 100644

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

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

@@ -8,7 +8,7 @@

#include "base/json/json_writer.h"

#include "base/values.h"

-#include "chrome/browser/extensions/extension_event_router.h"

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

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

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

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

@@ -38,7 +38,7 @@ std::string TrimLanguageCode(std::string lang) {

void GetExtensionVoices(Profile* profile, ListValue* result_voices) {

ExtensionService* service = profile->GetExtensionService();

DCHECK(service);

- ExtensionEventRouter* event_router = profile->GetExtensionEventRouter();

+ extensions::EventRouter* event_router = profile->GetExtensionEventRouter();

DCHECK(event_router);

const ExtensionSet* extensions = service->extensions();

@@ -100,7 +100,7 @@ bool GetMatchingExtensionVoice(

ExtensionService* service = utterance->profile()->GetExtensionService();

DCHECK(service);

- ExtensionEventRouter* event_router =

+ extensions::EventRouter* event_router =

utterance->profile()->GetExtensionEventRouter();

DCHECK(event_router);