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

Side by Side Diff: chrome/common/extensions/chrome_manifest_url_handlers.cc

Issue 1880143002: Convert chrome/common to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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) 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/chrome_manifest_url_handlers.h" 5 #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
6 6
7 #include <memory>
8
7 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
12 #include "base/values.h" 13 #include "base/values.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "chrome/common/chrome_constants.h" 15 #include "chrome/common/chrome_constants.h"
15 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
16 #include "extensions/common/error_utils.h" 17 #include "extensions/common/error_utils.h"
17 #include "extensions/common/manifest.h" 18 #include "extensions/common/manifest.h"
18 #include "extensions/common/manifest_constants.h" 19 #include "extensions/common/manifest_constants.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 : g_empty_url_overrides.Get(); 61 : g_empty_url_overrides.Get();
61 } 62 }
62 63
63 DevToolsPageHandler::DevToolsPageHandler() { 64 DevToolsPageHandler::DevToolsPageHandler() {
64 } 65 }
65 66
66 DevToolsPageHandler::~DevToolsPageHandler() { 67 DevToolsPageHandler::~DevToolsPageHandler() {
67 } 68 }
68 69
69 bool DevToolsPageHandler::Parse(Extension* extension, base::string16* error) { 70 bool DevToolsPageHandler::Parse(Extension* extension, base::string16* error) {
70 scoped_ptr<ManifestURL> manifest_url(new ManifestURL); 71 std::unique_ptr<ManifestURL> manifest_url(new ManifestURL);
71 std::string devtools_str; 72 std::string devtools_str;
72 if (!extension->manifest()->GetString(keys::kDevToolsPage, &devtools_str)) { 73 if (!extension->manifest()->GetString(keys::kDevToolsPage, &devtools_str)) {
73 *error = base::ASCIIToUTF16(errors::kInvalidDevToolsPage); 74 *error = base::ASCIIToUTF16(errors::kInvalidDevToolsPage);
74 return false; 75 return false;
75 } 76 }
76 manifest_url->url_ = extension->GetResourceURL(devtools_str); 77 manifest_url->url_ = extension->GetResourceURL(devtools_str);
77 extension->SetManifestData(keys::kDevToolsPage, manifest_url.release()); 78 extension->SetManifestData(keys::kDevToolsPage, manifest_url.release());
78 PermissionsParser::AddAPIPermission(extension, APIPermission::kDevtools); 79 PermissionsParser::AddAPIPermission(extension, APIPermission::kDevtools);
79 return true; 80 return true;
80 } 81 }
81 82
82 const std::vector<std::string> DevToolsPageHandler::Keys() const { 83 const std::vector<std::string> DevToolsPageHandler::Keys() const {
83 return SingleKey(keys::kDevToolsPage); 84 return SingleKey(keys::kDevToolsPage);
84 } 85 }
85 86
86 URLOverridesHandler::URLOverridesHandler() { 87 URLOverridesHandler::URLOverridesHandler() {
87 } 88 }
88 89
89 URLOverridesHandler::~URLOverridesHandler() { 90 URLOverridesHandler::~URLOverridesHandler() {
90 } 91 }
91 92
92 bool URLOverridesHandler::Parse(Extension* extension, base::string16* error) { 93 bool URLOverridesHandler::Parse(Extension* extension, base::string16* error) {
93 const base::DictionaryValue* overrides = NULL; 94 const base::DictionaryValue* overrides = NULL;
94 if (!extension->manifest()->GetDictionary(keys::kChromeURLOverrides, 95 if (!extension->manifest()->GetDictionary(keys::kChromeURLOverrides,
95 &overrides)) { 96 &overrides)) {
96 *error = base::ASCIIToUTF16(errors::kInvalidChromeURLOverrides); 97 *error = base::ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
97 return false; 98 return false;
98 } 99 }
99 scoped_ptr<URLOverrides> url_overrides(new URLOverrides); 100 std::unique_ptr<URLOverrides> url_overrides(new URLOverrides);
100 // Validate that the overrides are all strings 101 // Validate that the overrides are all strings
101 for (base::DictionaryValue::Iterator iter(*overrides); !iter.IsAtEnd(); 102 for (base::DictionaryValue::Iterator iter(*overrides); !iter.IsAtEnd();
102 iter.Advance()) { 103 iter.Advance()) {
103 std::string page = iter.key(); 104 std::string page = iter.key();
104 std::string val; 105 std::string val;
105 // Restrict override pages to a list of supported URLs. 106 // Restrict override pages to a list of supported URLs.
106 bool is_override = (page != chrome::kChromeUINewTabHost && 107 bool is_override = (page != chrome::kChromeUINewTabHost &&
107 page != chrome::kChromeUIBookmarksHost && 108 page != chrome::kChromeUIBookmarksHost &&
108 page != chrome::kChromeUIHistoryHost); 109 page != chrome::kChromeUIHistoryHost);
109 #if defined(OS_CHROMEOS) 110 #if defined(OS_CHROMEOS)
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 extension->SetManifestData(keys::kChromeURLOverrides, 145 extension->SetManifestData(keys::kChromeURLOverrides,
145 url_overrides.release()); 146 url_overrides.release());
146 return true; 147 return true;
147 } 148 }
148 149
149 const std::vector<std::string> URLOverridesHandler::Keys() const { 150 const std::vector<std::string> URLOverridesHandler::Keys() const {
150 return SingleKey(keys::kChromeURLOverrides); 151 return SingleKey(keys::kChromeURLOverrides);
151 } 152 }
152 153
153 } // namespace extensions 154 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/chrome_extensions_client_unittest.cc ('k') | chrome/common/extensions/command_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698