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

Side by Side Diff: extensions/common/manifest_handlers/default_locale_handler.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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
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 "extensions/common/manifest_handlers/default_locale_handler.h" 5 #include "extensions/common/manifest_handlers/default_locale_handler.h"
6 6
7 #include <memory>
8
7 #include "base/files/file_enumerator.h" 9 #include "base/files/file_enumerator.h"
8 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
11 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
12 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "extensions/common/constants.h" 15 #include "extensions/common/constants.h"
15 #include "extensions/common/extension_l10n_util.h" 16 #include "extensions/common/extension_l10n_util.h"
16 #include "extensions/common/manifest.h" 17 #include "extensions/common/manifest.h"
17 #include "extensions/common/manifest_constants.h" 18 #include "extensions/common/manifest_constants.h"
18 #include "grit/extensions_strings.h" 19 #include "grit/extensions_strings.h"
19 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
(...skipping 10 matching lines...) Expand all
30 return info ? info->default_locale : base::EmptyString(); 31 return info ? info->default_locale : base::EmptyString();
31 } 32 }
32 33
33 DefaultLocaleHandler::DefaultLocaleHandler() { 34 DefaultLocaleHandler::DefaultLocaleHandler() {
34 } 35 }
35 36
36 DefaultLocaleHandler::~DefaultLocaleHandler() { 37 DefaultLocaleHandler::~DefaultLocaleHandler() {
37 } 38 }
38 39
39 bool DefaultLocaleHandler::Parse(Extension* extension, base::string16* error) { 40 bool DefaultLocaleHandler::Parse(Extension* extension, base::string16* error) {
40 scoped_ptr<LocaleInfo> info(new LocaleInfo); 41 std::unique_ptr<LocaleInfo> info(new LocaleInfo);
41 if (!extension->manifest()->GetString(keys::kDefaultLocale, 42 if (!extension->manifest()->GetString(keys::kDefaultLocale,
42 &info->default_locale) || 43 &info->default_locale) ||
43 !l10n_util::IsValidLocaleSyntax(info->default_locale)) { 44 !l10n_util::IsValidLocaleSyntax(info->default_locale)) {
44 *error = base::ASCIIToUTF16(manifest_errors::kInvalidDefaultLocale); 45 *error = base::ASCIIToUTF16(manifest_errors::kInvalidDefaultLocale);
45 return false; 46 return false;
46 } 47 }
47 extension->SetManifestData(keys::kDefaultLocale, info.release()); 48 extension->SetManifestData(keys::kDefaultLocale, info.release());
48 return true; 49 return true;
49 } 50 }
50 51
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 bool DefaultLocaleHandler::AlwaysValidateForType(Manifest::Type type) const { 111 bool DefaultLocaleHandler::AlwaysValidateForType(Manifest::Type type) const {
111 // Required to validate _locales directory; see Validate. 112 // Required to validate _locales directory; see Validate.
112 return true; 113 return true;
113 } 114 }
114 115
115 const std::vector<std::string> DefaultLocaleHandler::Keys() const { 116 const std::vector<std::string> DefaultLocaleHandler::Keys() const {
116 return SingleKey(keys::kDefaultLocale); 117 return SingleKey(keys::kDefaultLocale);
117 } 118 }
118 119
119 } // namespace extensions 120 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/manifest_handlers/csp_info.cc ('k') | extensions/common/manifest_handlers/externally_connectable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698