diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/extensions/browser/process_map.cc | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/extensions/browser/process_map.cc')
| -rw-r--r-- | chromium/extensions/browser/process_map.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/extensions/browser/process_map.cc b/chromium/extensions/browser/process_map.cc index b3100201d01..c12c63578f8 100644 --- a/chromium/extensions/browser/process_map.cc +++ b/chromium/extensions/browser/process_map.cc @@ -116,8 +116,8 @@ std::set<std::string> ProcessMap::GetExtensionsInProcess(int process_id) const { Feature::Context ProcessMap::GetMostLikelyContextType( const Extension* extension, int process_id) const { - // WARNING: This logic must match Dispatcher::ClassifyJavaScriptContext, as - // much as possible. + // WARNING: This logic must match ScriptContextSet::ClassifyJavaScriptContext, + // as much as possible. if (content::ChildProcessSecurityPolicy::GetInstance()->HasWebUIBindings( process_id)) { @@ -140,7 +140,8 @@ Feature::Context ProcessMap::GetMostLikelyContextType( return Feature::BLESSED_WEB_PAGE_CONTEXT; } - return Feature::BLESSED_EXTENSION_CONTEXT; + return is_lock_screen_context_ ? Feature::LOCK_SCREEN_EXTENSION_CONTEXT + : Feature::BLESSED_EXTENSION_CONTEXT; } } // namespace extensions |