diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 08:24:59 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 08:24:59 +0000 |
| commit | f36ed64560f4b52724d223bc870addc5a5e3b73c (patch) | |
| tree | a57f393275bf6b24bb8b3d31d93a587544cd0cb9 /chrome/common/extensions/extension.cc | |
| parent | 7e5d1e689c3c5a8858a9675df46ca327f51b7c6e (diff) | |
| download | chromium_src-f36ed64560f4b52724d223bc870addc5a5e3b73c.zip chromium_src-f36ed64560f4b52724d223bc870addc5a5e3b73c.tar.gz chromium_src-f36ed64560f4b52724d223bc870addc5a5e3b73c.tar.bz2 | |
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
Diffstat (limited to 'chrome/common/extensions/extension.cc')
| -rw-r--r-- | chrome/common/extensions/extension.cc | 18 |
1 files changed, 2 insertions, 16 deletions
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(); |