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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 12253022: Manifest handler for all keys background-related. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index a3c33ea39d4992561c60de925c81ef2156909ca2..1b2d8338e3522e4a9fbbbb08f3102acf12dcb05c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -82,6 +82,7 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/background_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_process_policy.h"
#include "chrome/common/extensions/extension_set.h"
@@ -789,7 +790,7 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
// responsiveness.
if (extension->GetType() == Manifest::TYPE_HOSTED_APP) {
if (!extension->HasAPIPermission(APIPermission::kBackground) ||
- !extension->allow_background_js_access()) {
+ !extensions::BackgroundInfo::AllowJSAccess(extension)) {
return false;
}
}
@@ -913,7 +914,7 @@ bool ChromeContentBrowserClient::ShouldTryToUseExistingProcessHost(
service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(url));
if (!extension)
return false;
- if (!extension->has_background_page())
+ if (!extensions::BackgroundInfo::HasBackgroundPage(extension))
return false;
std::set<int> process_ids;
@@ -1639,7 +1640,7 @@ bool ChromeContentBrowserClient::CanCreateWindow(
// just the origin.
const Extension* extension = map->extensions().GetExtensionOrAppByURL(
ExtensionURLInfo(opener_url));
- if (extension && !extension->allow_background_js_access())
+ if (extension && !extensions::BackgroundInfo::AllowJSAccess(extension))
*no_javascript_access = true;
}
return true;

Powered by Google App Engine
This is Rietveld 408576698