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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/manifest_url_handler.cc
diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc
index 8dcbe1e006591549558d22eeee3795d5c07235bb..97e7b767d568bd63f1ad849654d38790efad4a83 100644
--- a/chrome/common/extensions/manifest_url_handler.cc
+++ b/chrome/common/extensions/manifest_url_handler.cc
@@ -5,9 +5,13 @@
#include "chrome/common/extensions/manifest_url_handler.h"
#include "base/memory/scoped_ptr.h"
+#include "base/string_util.h"
+#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/common/chrome_constants.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/url_constants.h"
#include "extensions/common/error_utils.h"
namespace keys = extension_manifest_keys;
@@ -17,6 +21,8 @@ namespace extensions {
namespace {
+const char kOverrideExtentUrlPatternFormat[] = "chrome://%s/*";
+
const GURL& GetManifestURL(const Extension* extension,
const std::string& key) {
ManifestURL* manifest_url =
@@ -41,6 +47,20 @@ const GURL ManifestURL::GetHomepageURL(const Extension* extension) {
GURL::EmptyGURL();
}
+URLOverrides::URLOverrides() {
+}
+
+URLOverrides::~URLOverrides() {
+}
+
+// static
+const URLOverrides::URLOverrideMap*
+ URLOverrides::GetChromeURLOverrides(const Extension* extension) {
+ URLOverrides* url_overrides = static_cast<URLOverrides*>(
+ extension->GetManifestData(keys::kChromeURLOverrides));
+ return (url_overrides) ? &url_overrides->chrome_url_overrides_ : NULL;
+}
+
DevToolsPageHandler::DevToolsPageHandler() {
}
@@ -89,4 +109,70 @@ bool HomepageURLHandler::Parse(const base::Value* value,
return true;
}
+URLOverridesHandler::URLOverridesHandler() {
+}
+
+URLOverridesHandler::~URLOverridesHandler() {
+}
+
+bool URLOverridesHandler::Parse(const base::Value* value,
+ Extension* extension,
+ string16* error) {
+ const DictionaryValue* overrides = NULL;
+ if (!value->GetAsDictionary(&overrides)) {
+ *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
+ return false;
+ }
+ scoped_ptr<URLOverrides> url_overrides(new URLOverrides);
+ // Validate that the overrides are all strings
+ for (DictionaryValue::key_iterator iter = overrides->begin_keys();
+ iter != overrides->end_keys(); ++iter) {
+ std::string page = *iter;
+ std::string val;
+ // Restrict override pages to a list of supported URLs.
+ bool is_override = (page != chrome::kChromeUINewTabHost &&
+ page != chrome::kChromeUIBookmarksHost &&
+ page != chrome::kChromeUIHistoryHost);
+#if defined(OS_CHROMEOS)
+ is_override = (is_override &&
+ page != chrome::kChromeUIActivationMessageHost);
+#endif
+#if defined(FILE_MANAGER_EXTENSION)
+ is_override = (is_override &&
+ !(extension->location() == Extension::COMPONENT &&
+ page == chrome::kChromeUIFileManagerHost));
+#endif
+
+ if (is_override || !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
+ *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
+ return false;
+ }
+ // Replace the entry with a fully qualified chrome-extension:// URL.
+ url_overrides->chrome_url_overrides_[page] = extension->GetResourceURL(val);
+
+ // For component extensions, add override URL to extent patterns.
+ if (extension->is_legacy_packaged_app() &&
+ extension->location() == Extension::COMPONENT) {
+ URLPattern pattern(URLPattern::SCHEME_CHROMEUI);
+ std::string url = base::StringPrintf(kOverrideExtentUrlPatternFormat,
+ page.c_str());
+ if (pattern.Parse(url) != URLPattern::PARSE_SUCCESS) {
+ *error = ErrorUtils::FormatErrorMessageUTF16(
+ errors::kInvalidURLPatternError, url);
+ return false;
+ }
+ extension->AddWebExtentPattern(pattern);
+ }
+ }
+
+ // An extension may override at most one page.
+ if (overrides->size() > 1) {
+ *error = ASCIIToUTF16(errors::kMultipleOverrides);
+ return false;
+ }
+ extension->SetManifestData(keys::kChromeURLOverrides,
+ url_overrides.release());
+ return true;
+}
+
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698