diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 00:25:19 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 00:25:19 +0000 |
| commit | 233c172a8a3c1390dc40f7fa0740265ab4debf71 (patch) | |
| tree | 070231f008ce6bc4de2e0a8786c198099c5af7f0 | |
| parent | 263155b4312fe3643f72af5e8a1c18ff6f669250 (diff) | |
| download | chromium_src-233c172a8a3c1390dc40f7fa0740265ab4debf71.zip chromium_src-233c172a8a3c1390dc40f7fa0740265ab4debf71.tar.gz chromium_src-233c172a8a3c1390dc40f7fa0740265ab4debf71.tar.bz2 | |
Merge 201780 "Properly catch user scripts"
> Properly catch user scripts
>
> The problem was that we were setting converted_from_user_script_ after we
> referenced it within ContextScriptHandler::Parse().
>
> BUG=242890
>
> Review URL: https://chromiumcodereview.appspot.com/15685011
TBR=rdevlin.cronin@chromium.org
Review URL: https://codereview.chromium.org/15793004
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@202706 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/extension.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index aa7b5f4..44badb6 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -1170,13 +1170,13 @@ bool Extension::InitFromValue(int flags, string16* error) { return false; } - if (!LoadSharedFeatures(error)) - return false; - if (manifest_->HasKey(keys::kConvertedFromUserScript)) manifest_->GetBoolean(keys::kConvertedFromUserScript, &converted_from_user_script_); + if (!LoadSharedFeatures(error)) + return false; + if (HasMultipleUISurfaces()) { *error = ASCIIToUTF16(errors::kOneUISurfaceOnly); return false; |