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

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

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/icons_handler.h" 5 #include "extensions/common/manifest_handlers/icons_handler.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 51
52 IconsHandler::IconsHandler() { 52 IconsHandler::IconsHandler() {
53 } 53 }
54 54
55 IconsHandler::~IconsHandler() { 55 IconsHandler::~IconsHandler() {
56 } 56 }
57 57
58 bool IconsHandler::Parse(Extension* extension, base::string16* error) { 58 bool IconsHandler::Parse(Extension* extension, base::string16* error) {
59 scoped_ptr<IconsInfo> icons_info(new IconsInfo); 59 scoped_ptr<IconsInfo> icons_info(new IconsInfo);
60 const base::DictionaryValue* icons_dict = NULL; 60 const base::DictionaryValue* icons_dict = nullptr;
61 if (!extension->manifest()->GetDictionary(keys::kIcons, &icons_dict)) { 61 if (!extension->manifest()->GetDictionary(keys::kIcons, &icons_dict)) {
62 *error = base::ASCIIToUTF16(manifest_errors::kInvalidIcons); 62 *error = base::ASCIIToUTF16(manifest_errors::kInvalidIcons);
63 return false; 63 return false;
64 } 64 }
65 65
66 if (!manifest_handler_helpers::LoadIconsFromDictionary( 66 if (!manifest_handler_helpers::LoadIconsFromDictionary(
67 icons_dict, 67 icons_dict,
68 extension_misc::kExtensionIconSizes, 68 extension_misc::kExtensionIconSizes,
69 extension_misc::kNumExtensionIconSizes, 69 extension_misc::kNumExtensionIconSizes,
70 &icons_info->icons, 70 &icons_info->icons,
(...skipping 12 matching lines...) Expand all
83 extension, 83 extension,
84 IDS_EXTENSION_LOAD_ICON_FAILED, 84 IDS_EXTENSION_LOAD_ICON_FAILED,
85 error); 85 error);
86 } 86 }
87 87
88 const std::vector<std::string> IconsHandler::Keys() const { 88 const std::vector<std::string> IconsHandler::Keys() const {
89 return SingleKey(keys::kIcons); 89 return SingleKey(keys::kIcons);
90 } 90 }
91 91
92 } // namespace extensions 92 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698