| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index efda053694c2ffc68eee22b45643a3fb567f1d61..bb5841766d457d2c1950424d2fc2202ac64b2c85 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -142,6 +142,7 @@
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/custom_handlers/protocol_handler.h"
|
| +#include "chrome/common/extensions/background_info.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -2212,7 +2213,7 @@ bool Browser::MaybeCreateBackgroundContents(int route_id,
|
| }
|
|
|
| // Only allow a single background contents per app.
|
| - bool allow_js_access = extension->allow_background_js_access();
|
| + bool allow_js_access = extensions::BackgroundInfo::AllowJSAccess(extension);
|
| BackgroundContents* existing =
|
| service->GetAppBackgroundContents(ASCIIToUTF16(extension->id()));
|
| if (existing) {
|
|
|