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

Side by Side Diff: chrome/common/extensions/api/spellcheck/spellcheck_handler.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/spellcheck/spellcheck_handler.h" 5 #include "chrome/common/extensions/api/spellcheck/spellcheck_handler.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "extensions/common/manifest_constants.h" 8 #include "extensions/common/manifest_constants.h"
9 9
10 namespace extensions { 10 namespace extensions {
(...skipping 10 matching lines...) Expand all
21 SpellcheckHandler::SpellcheckHandler() { 21 SpellcheckHandler::SpellcheckHandler() {
22 } 22 }
23 23
24 SpellcheckHandler::~SpellcheckHandler() { 24 SpellcheckHandler::~SpellcheckHandler() {
25 } 25 }
26 26
27 bool SpellcheckHandler::Parse(Extension* extension, base::string16* error) { 27 bool SpellcheckHandler::Parse(Extension* extension, base::string16* error) {
28 const base::DictionaryValue* spellcheck_value = NULL; 28 const base::DictionaryValue* spellcheck_value = NULL;
29 if (!extension->manifest()->GetDictionary(keys::kSpellcheck, 29 if (!extension->manifest()->GetDictionary(keys::kSpellcheck,
30 &spellcheck_value)) { 30 &spellcheck_value)) {
31 *error = ASCIIToUTF16(errors::kInvalidSpellcheck); 31 *error = base::ASCIIToUTF16(errors::kInvalidSpellcheck);
32 return false; 32 return false;
33 } 33 }
34 scoped_ptr<SpellcheckDictionaryInfo> spellcheck_info( 34 scoped_ptr<SpellcheckDictionaryInfo> spellcheck_info(
35 new SpellcheckDictionaryInfo); 35 new SpellcheckDictionaryInfo);
36 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryLanguage) || 36 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryLanguage) ||
37 !spellcheck_value->GetString(keys::kSpellcheckDictionaryLanguage, 37 !spellcheck_value->GetString(keys::kSpellcheckDictionaryLanguage,
38 &spellcheck_info->language)) { 38 &spellcheck_info->language)) {
39 *error = ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryLanguage); 39 *error = base::ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryLanguage);
40 return false; 40 return false;
41 } 41 }
42 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryLocale) || 42 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryLocale) ||
43 !spellcheck_value->GetString(keys::kSpellcheckDictionaryLocale, 43 !spellcheck_value->GetString(keys::kSpellcheckDictionaryLocale,
44 &spellcheck_info->locale)) { 44 &spellcheck_info->locale)) {
45 *error = ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryLocale); 45 *error = base::ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryLocale);
46 return false; 46 return false;
47 } 47 }
48 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryFormat) || 48 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryFormat) ||
49 !spellcheck_value->GetString(keys::kSpellcheckDictionaryFormat, 49 !spellcheck_value->GetString(keys::kSpellcheckDictionaryFormat,
50 &spellcheck_info->format)) { 50 &spellcheck_info->format)) {
51 *error = ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryFormat); 51 *error = base::ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryFormat);
52 return false; 52 return false;
53 } 53 }
54 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryPath) || 54 if (!spellcheck_value->HasKey(keys::kSpellcheckDictionaryPath) ||
55 !spellcheck_value->GetString(keys::kSpellcheckDictionaryPath, 55 !spellcheck_value->GetString(keys::kSpellcheckDictionaryPath,
56 &spellcheck_info->path)) { 56 &spellcheck_info->path)) {
57 *error = ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryPath); 57 *error = base::ASCIIToUTF16(errors::kInvalidSpellcheckDictionaryPath);
58 return false; 58 return false;
59 } 59 }
60 extension->SetManifestData(keys::kSpellcheck, spellcheck_info.release()); 60 extension->SetManifestData(keys::kSpellcheck, spellcheck_info.release());
61 return true; 61 return true;
62 } 62 }
63 63
64 const std::vector<std::string> SpellcheckHandler::Keys() const { 64 const std::vector<std::string> SpellcheckHandler::Keys() const {
65 return SingleKey(keys::kSpellcheck); 65 return SingleKey(keys::kSpellcheck);
66 } 66 }
67 67
68 } // namespace extensions 68 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698