From f36ed64560f4b52724d223bc870addc5a5e3b73c Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Fri, 15 Jan 2010 08:24:59 +0000 Subject: Revert 36337 and 36338. Compile failure. TBR=erikkay@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36339 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/extensions/extension.cc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'chrome/common/extensions/extension.cc') diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 6a6490f..2a0f139 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -506,24 +506,10 @@ bool Extension::LoadAppHelper(const DictionaryValue* app, std::string* error) { return false; } - // launch URL - std::string launch_url_spec; - if (!app->GetString(keys::kAppLaunchUrl, &launch_url_spec)) { - *error = errors::kInvalidAppLaunchUrl; - return false; - } - app_launch_url_ = GURL(launch_url_spec); - if (!app_launch_url_.is_valid()) { - *error = errors::kInvalidAppLaunchUrl; - return false; - } - // The launch URL is automatically an allowed origin. - app_origins_.push_back(url.GetOrigin()); - - // origins ListValue* origins; if (!app->GetList(keys::kAppOrigins, &origins) || origins->GetSize() == 0) { - *error = errors::kInvalidAppOrigin; + *error = + ExtensionErrorUtils::FormatErrorMessage(errors::kInvalidAppOrigin, ""); return false; } for (ListValue::const_iterator iter = origins->begin(); -- cgit v1.1