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

Issues Search
    My Issues | Starred     Open | Closed | All

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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/extension_process_manager.cc ('K') | « chrome/browser/extensions/extension_process_manager.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | chrome/common/extensions/background_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_protocols.cc
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index be7bab6f71eb518c4a3f9f70fb75c7e56fda0f09..d258140768b9f646121faa0e9b34010d7e1e737a 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/extensions/image_loader.h"
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/common/chrome_paths.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"
@@ -168,9 +169,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";
}
« chrome/browser/extensions/extension_process_manager.cc ('K') | « chrome/browser/extensions/extension_process_manager.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | chrome/common/extensions/background_info.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698