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

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

Issue 11660016: Move the parsing of "chrome_url_overrides" out of Extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments addressed Created 7 years, 11 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/manifest_url_handler.h" 5 #include "chrome/common/extensions/manifest_url_handler.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/string_util.h"
9 #include "base/stringprintf.h"
8 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
9 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/common/chrome_constants.h"
10 #include "chrome/common/extensions/extension_manifest_constants.h" 13 #include "chrome/common/extensions/extension_manifest_constants.h"
14 #include "chrome/common/url_constants.h"
11 #include "extensions/common/error_utils.h" 15 #include "extensions/common/error_utils.h"
12 16
13 namespace keys = extension_manifest_keys; 17 namespace keys = extension_manifest_keys;
14 namespace errors = extension_manifest_errors; 18 namespace errors = extension_manifest_errors;
15 19
16 namespace extensions { 20 namespace extensions {
17 21
18 namespace { 22 namespace {
19 23
24 const char kOverrideExtentUrlPatternFormat[] = "chrome://%s/*";
25
20 const GURL& GetManifestURL(const Extension* extension, 26 const GURL& GetManifestURL(const Extension* extension,
21 const std::string& key) { 27 const std::string& key) {
22 ManifestURL* manifest_url = 28 ManifestURL* manifest_url =
23 static_cast<ManifestURL*>(extension->GetManifestData(key)); 29 static_cast<ManifestURL*>(extension->GetManifestData(key));
24 return manifest_url ? manifest_url->url_ : GURL::EmptyGURL(); 30 return manifest_url ? manifest_url->url_ : GURL::EmptyGURL();
25 } 31 }
26 32
27 } // namespace 33 } // namespace
28 34
29 // static 35 // static
30 const GURL& ManifestURL::GetDevToolsPage(const Extension* extension) { 36 const GURL& ManifestURL::GetDevToolsPage(const Extension* extension) {
31 return GetManifestURL(extension, keys::kDevToolsPage); 37 return GetManifestURL(extension, keys::kDevToolsPage);
32 } 38 }
33 39
34 // static 40 // static
35 const GURL ManifestURL::GetHomepageURL(const Extension* extension) { 41 const GURL ManifestURL::GetHomepageURL(const Extension* extension) {
36 const GURL& homepage_url = GetManifestURL(extension, keys::kHomepageURL); 42 const GURL& homepage_url = GetManifestURL(extension, keys::kHomepageURL);
37 if (homepage_url.is_valid()) 43 if (homepage_url.is_valid())
38 return homepage_url; 44 return homepage_url;
39 return extension->UpdatesFromGallery() ? 45 return extension->UpdatesFromGallery() ?
40 GURL(extension_urls::GetWebstoreItemDetailURLPrefix() + extension->id()) : 46 GURL(extension_urls::GetWebstoreItemDetailURLPrefix() + extension->id()) :
41 GURL::EmptyGURL(); 47 GURL::EmptyGURL();
42 } 48 }
43 49
50 URLOverrides::URLOverrides() {
51 }
52
53 URLOverrides::~URLOverrides() {
54 }
55
56 // static
57 const URLOverrides::URLOverrideMap*
58 URLOverrides::GetChromeURLOverrides(const Extension* extension) {
59 URLOverrides* url_overrides = static_cast<URLOverrides*>(
60 extension->GetManifestData(keys::kChromeURLOverrides));
61 return (url_overrides) ? &url_overrides->chrome_url_overrides_ : NULL;
62 }
63
44 DevToolsPageHandler::DevToolsPageHandler() { 64 DevToolsPageHandler::DevToolsPageHandler() {
45 } 65 }
46 66
47 DevToolsPageHandler::~DevToolsPageHandler() { 67 DevToolsPageHandler::~DevToolsPageHandler() {
48 } 68 }
49 69
50 bool DevToolsPageHandler::Parse(const base::Value* value, 70 bool DevToolsPageHandler::Parse(const base::Value* value,
51 Extension* extension, 71 Extension* extension,
52 string16* error) { 72 string16* error) {
53 scoped_ptr<ManifestURL> manifest_url(new ManifestURL); 73 scoped_ptr<ManifestURL> manifest_url(new ManifestURL);
(...skipping 28 matching lines...) Expand all
82 (!manifest_url->url_.SchemeIs("http") && 102 (!manifest_url->url_.SchemeIs("http") &&
83 !manifest_url->url_.SchemeIs("https"))) { 103 !manifest_url->url_.SchemeIs("https"))) {
84 *error = ErrorUtils::FormatErrorMessageUTF16( 104 *error = ErrorUtils::FormatErrorMessageUTF16(
85 errors::kInvalidHomepageURL, homepage_url_str); 105 errors::kInvalidHomepageURL, homepage_url_str);
86 return false; 106 return false;
87 } 107 }
88 extension->SetManifestData(keys::kHomepageURL, manifest_url.release()); 108 extension->SetManifestData(keys::kHomepageURL, manifest_url.release());
89 return true; 109 return true;
90 } 110 }
91 111
112 URLOverridesHandler::URLOverridesHandler() {
113 }
114
115 URLOverridesHandler::~URLOverridesHandler() {
116 }
117
118 bool URLOverridesHandler::Parse(const base::Value* value,
119 Extension* extension,
120 string16* error) {
121 const DictionaryValue* overrides = NULL;
122 if (!value->GetAsDictionary(&overrides)) {
123 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
124 return false;
125 }
126 scoped_ptr<URLOverrides> url_overrides(new URLOverrides);
127 // Validate that the overrides are all strings
128 for (DictionaryValue::key_iterator iter = overrides->begin_keys();
129 iter != overrides->end_keys(); ++iter) {
130 std::string page = *iter;
131 std::string val;
132 // Restrict override pages to a list of supported URLs.
133 bool is_override = (page != chrome::kChromeUINewTabHost &&
134 page != chrome::kChromeUIBookmarksHost &&
135 page != chrome::kChromeUIHistoryHost);
136 #if defined(OS_CHROMEOS)
137 is_override = (is_override &&
138 page != chrome::kChromeUIActivationMessageHost);
139 #endif
140 #if defined(FILE_MANAGER_EXTENSION)
141 is_override = (is_override &&
142 !(extension->location() == Extension::COMPONENT &&
143 page == chrome::kChromeUIFileManagerHost));
144 #endif
145
146 if (is_override || !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
147 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
148 return false;
149 }
150 // Replace the entry with a fully qualified chrome-extension:// URL.
151 url_overrides->chrome_url_overrides_[page] = extension->GetResourceURL(val);
152
153 // For component extensions, add override URL to extent patterns.
154 if (extension->is_legacy_packaged_app() &&
155 extension->location() == Extension::COMPONENT) {
156 URLPattern pattern(URLPattern::SCHEME_CHROMEUI);
157 std::string url = base::StringPrintf(kOverrideExtentUrlPatternFormat,
158 page.c_str());
159 if (pattern.Parse(url) != URLPattern::PARSE_SUCCESS) {
160 *error = ErrorUtils::FormatErrorMessageUTF16(
161 errors::kInvalidURLPatternError, url);
162 return false;
163 }
164 extension->AddWebExtentPattern(pattern);
165 }
166 }
167
168 // An extension may override at most one page.
169 if (overrides->size() > 1) {
170 *error = ASCIIToUTF16(errors::kMultipleOverrides);
171 return false;
172 }
173 extension->SetManifestData(keys::kChromeURLOverrides,
174 url_overrides.release());
175 return true;
176 }
177
92 } // namespace extensions 178 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698