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

Side by Side Diff: chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc

Issue 12084034: Change manifest handler interface to always (implicitly) pass the entire manifest to handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tts, TODO Created 7 years, 10 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
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 "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h" 5 #include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/common/extensions/extension_manifest_constants.h" 11 #include "chrome/common/extensions/extension_manifest_constants.h"
12 #include "chrome/common/extensions/manifest.h"
12 #include "extensions/common/error_utils.h" 13 #include "extensions/common/error_utils.h"
13 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
14 15
15 namespace keys = extension_manifest_keys; 16 namespace keys = extension_manifest_keys;
16 namespace errors = extension_manifest_errors; 17 namespace errors = extension_manifest_errors;
17 18
18 namespace { 19 namespace {
19 20
20 struct TtsVoices : public extensions::Extension::ManifestData { 21 struct TtsVoices : public extensions::Extension::ManifestData {
21 TtsVoices() {} 22 TtsVoices() {}
(...skipping 16 matching lines...) Expand all
38 extension->GetManifestData(keys::kTtsVoices)); 39 extension->GetManifestData(keys::kTtsVoices));
39 return info ? &info->voices : NULL; 40 return info ? &info->voices : NULL;
40 } 41 }
41 42
42 TtsEngineManifestHandler::TtsEngineManifestHandler() { 43 TtsEngineManifestHandler::TtsEngineManifestHandler() {
43 } 44 }
44 45
45 TtsEngineManifestHandler::~TtsEngineManifestHandler() { 46 TtsEngineManifestHandler::~TtsEngineManifestHandler() {
46 } 47 }
47 48
48 bool TtsEngineManifestHandler::Parse(const base::Value* value, 49 bool TtsEngineManifestHandler::Parse(Extension* extension, string16* error) {
49 Extension* extension, string16* error) {
50 scoped_ptr<TtsVoices> info(new TtsVoices); 50 scoped_ptr<TtsVoices> info(new TtsVoices);
51 const DictionaryValue* tts_dict = NULL; 51 const DictionaryValue* tts_dict = NULL;
52 if (!value->GetAsDictionary(&tts_dict)) { 52 if (!extension->manifest()->GetDictionary(keys::kTtsEngine, &tts_dict)) {
53 *error = ASCIIToUTF16(errors::kInvalidTts); 53 *error = ASCIIToUTF16(errors::kInvalidTts);
54 return false; 54 return false;
55 } 55 }
56 56
57 if (!tts_dict->HasKey(keys::kTtsVoices)) 57 if (!tts_dict->HasKey(keys::kTtsVoices))
58 return true; 58 return true;
59 59
60 const ListValue* tts_voices = NULL; 60 const ListValue* tts_voices = NULL;
61 if (!tts_dict->GetList(keys::kTtsVoices, &tts_voices)) { 61 if (!tts_dict->GetList(keys::kTtsVoices, &tts_voices)) {
62 *error = ASCIIToUTF16(errors::kInvalidTtsVoices); 62 *error = ASCIIToUTF16(errors::kInvalidTtsVoices);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 130
131 info->voices.push_back(voice_data); 131 info->voices.push_back(voice_data);
132 } 132 }
133 133
134 extension->SetManifestData(keys::kTtsVoices, info.release()); 134 extension->SetManifestData(keys::kTtsVoices, info.release());
135 return true; 135 return true;
136 } 136 }
137 137
138 } // namespace extensions 138 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/speech/tts_engine_manifest_handler.h ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698