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

Side by Side Diff: chrome/browser/extensions/extension_tts_engine_api.cc

Issue 8789018: Revert 113047 - Make ExtensionService use ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_tts_engine_api.h" 5 #include "chrome/browser/extensions/extension_tts_engine_api.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 10 matching lines...) Expand all
21 const char kOnSpeak[] = "ttsEngine.onSpeak"; 21 const char kOnSpeak[] = "ttsEngine.onSpeak";
22 const char kOnStop[] = "ttsEngine.onStop"; 22 const char kOnStop[] = "ttsEngine.onStop";
23 }; // namespace events 23 }; // namespace events
24 24
25 void GetExtensionVoices(Profile* profile, ListValue* result_voices) { 25 void GetExtensionVoices(Profile* profile, ListValue* result_voices) {
26 ExtensionService* service = profile->GetExtensionService(); 26 ExtensionService* service = profile->GetExtensionService();
27 DCHECK(service); 27 DCHECK(service);
28 ExtensionEventRouter* event_router = profile->GetExtensionEventRouter(); 28 ExtensionEventRouter* event_router = profile->GetExtensionEventRouter();
29 DCHECK(event_router); 29 DCHECK(event_router);
30 30
31 const ExtensionSet* extensions = service->extensions(); 31 const ExtensionList* extensions = service->extensions();
32 ExtensionSet::const_iterator iter; 32 ExtensionList::const_iterator iter;
33 for (iter = extensions->begin(); iter != extensions->end(); ++iter) { 33 for (iter = extensions->begin(); iter != extensions->end(); ++iter) {
34 const Extension* extension = *iter; 34 const Extension* extension = *iter;
35 35
36 if (!event_router->ExtensionHasEventListener( 36 if (!event_router->ExtensionHasEventListener(
37 extension->id(), events::kOnSpeak) || 37 extension->id(), events::kOnSpeak) ||
38 !event_router->ExtensionHasEventListener( 38 !event_router->ExtensionHasEventListener(
39 extension->id(), events::kOnStop)) { 39 extension->id(), events::kOnStop)) {
40 continue; 40 continue;
41 } 41 }
42 42
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 return false; 86 return false;
87 87
88 ExtensionService* service = utterance->profile()->GetExtensionService(); 88 ExtensionService* service = utterance->profile()->GetExtensionService();
89 DCHECK(service); 89 DCHECK(service);
90 ExtensionEventRouter* event_router = 90 ExtensionEventRouter* event_router =
91 utterance->profile()->GetExtensionEventRouter(); 91 utterance->profile()->GetExtensionEventRouter();
92 DCHECK(event_router); 92 DCHECK(event_router);
93 93
94 *matching_extension = NULL; 94 *matching_extension = NULL;
95 *voice_index = -1; 95 *voice_index = -1;
96 const ExtensionSet* extensions = service->extensions(); 96 const ExtensionList* extensions = service->extensions();
97 ExtensionSet::const_iterator iter; 97 ExtensionList::const_iterator iter;
98 for (iter = extensions->begin(); iter != extensions->end(); ++iter) { 98 for (iter = extensions->begin(); iter != extensions->end(); ++iter) {
99 const Extension* extension = *iter; 99 const Extension* extension = *iter;
100 100
101 if (!event_router->ExtensionHasEventListener( 101 if (!event_router->ExtensionHasEventListener(
102 extension->id(), events::kOnSpeak) || 102 extension->id(), events::kOnSpeak) ||
103 !event_router->ExtensionHasEventListener( 103 !event_router->ExtensionHasEventListener(
104 extension->id(), events::kOnStop)) { 104 extension->id(), events::kOnStop)) {
105 continue; 105 continue;
106 } 106 }
107 107
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 std::string error_message; 257 std::string error_message;
258 event->GetString(constants::kErrorMessageKey, &error_message); 258 event->GetString(constants::kErrorMessageKey, &error_message);
259 controller->OnTtsEvent( 259 controller->OnTtsEvent(
260 utterance_id, TTS_EVENT_ERROR, char_index, error_message); 260 utterance_id, TTS_EVENT_ERROR, char_index, error_message);
261 } else { 261 } else {
262 EXTENSION_FUNCTION_VALIDATE(false); 262 EXTENSION_FUNCTION_VALIDATE(false);
263 } 263 }
264 264
265 return true; 265 return true;
266 } 266 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_toolbar_model.cc ('k') | chrome/browser/extensions/extension_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698