chrome/browser/extensions/extension_protocols.cc - Issue 12253022: Manifest handler for all keys background-related.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_protocols.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:

Index: chrome/browser/extensions/extension_protocols.cc

diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc

index 01290747e6e53d5dee42eba023160a05a65f3392..4072d39b1b7d3f861e9f2a1c0d79ec825e25c592 100644

--- a/chrome/browser/extensions/extension_protocols.cc

+++ b/chrome/browser/extensions/extension_protocols.cc

@@ -22,6 +22,7 @@

#include "chrome/browser/net/chrome_url_request_context.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/extensions/api/icons/icons_handler.h"

+#include "chrome/common/extensions/background_info.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_file_util.h"

#include "chrome/common/extensions/extension_resource.h"

@@ -170,9 +171,11 @@ class GeneratedBackgroundPageJob : public net::URLRequestSimpleJob {

*charset = "utf-8";

*data = "<!DOCTYPE html>\n<body>\n";

- for (size_t i = 0; i < extension_->background_scripts().size(); ++i) {

+ const std::vector<std::string>& background_scripts =

+ extensions::BackgroundInfo::GetBackgroundScripts(extension_);

+ for (size_t i = 0; i < background_scripts.size(); ++i) {

*data += "<script src=\"";

- *data += extension_->background_scripts()[i];

+ *data += background_scripts[i];

*data += "\"></script>\n";

}