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

Unified Diff: chrome/renderer/extensions/chrome_v8_extension.cc

Issue 8277020: Stop copying extension bindings scripts. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed orphaned variable. Created 9 years, 1 month 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
« no previous file with comments | « chrome/renderer/extensions/chrome_v8_extension.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/chrome_v8_extension.cc
diff --git a/chrome/renderer/extensions/chrome_v8_extension.cc b/chrome/renderer/extensions/chrome_v8_extension.cc
index 1320a8627df57c24161f7dae2fcbe37bca8b3132..51ceea4b1cb247a7d4941ca9a88e373a5a25e0ad 100644
--- a/chrome/renderer/extensions/chrome_v8_extension.cc
+++ b/chrome/renderer/extensions/chrome_v8_extension.cc
@@ -31,9 +31,6 @@ const char kChromeHidden[] = "chromeHidden";
const char kValidateCallbacks[] = "validateCallbacks";
#endif
-typedef std::map<int, std::string> StringMap;
-static base::LazyInstance<StringMap> g_string_map = LAZY_INSTANCE_INITIALIZER;
-
static base::LazyInstance<ChromeV8Extension::InstanceSet> g_instances =
LAZY_INSTANCE_INITIALIZER;
@@ -41,16 +38,8 @@ static base::LazyInstance<ChromeV8Extension::InstanceSet> g_instances =
// static
-const char* ChromeV8Extension::GetStringResource(int resource_id) {
- StringMap* strings = g_string_map.Pointer();
- StringMap::iterator it = strings->find(resource_id);
- if (it == strings->end()) {
- it = strings->insert(std::make_pair(
- resource_id,
- ResourceBundle::GetSharedInstance().GetRawDataResource(
- resource_id).as_string())).first;
- }
- return it->second.c_str();
+base::StringPiece ChromeV8Extension::GetStringResource(int resource_id) {
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
}
// static
@@ -72,9 +61,10 @@ content::RenderView* ChromeV8Extension::GetCurrentRenderView() {
ChromeV8Extension::ChromeV8Extension(const char* name, int resource_id,
ExtensionDispatcher* extension_dispatcher)
: v8::Extension(name,
- GetStringResource(resource_id),
- 0, // num dependencies
- NULL), // dependencies array
+ GetStringResource(resource_id).data(),
+ 0, // num dependencies
+ NULL, // dependencies array
+ GetStringResource(resource_id).size()), // source length
extension_dispatcher_(extension_dispatcher) {
g_instances.Get().insert(this);
}
@@ -84,9 +74,10 @@ ChromeV8Extension::ChromeV8Extension(const char* name, int resource_id,
const char** dependencies,
ExtensionDispatcher* extension_dispatcher)
: v8::Extension(name,
- GetStringResource(resource_id),
+ GetStringResource(resource_id).data(),
dependency_count,
- dependencies),
+ dependencies,
+ GetStringResource(resource_id).size()),
extension_dispatcher_(extension_dispatcher) {
g_instances.Get().insert(this);
}
« no previous file with comments | « chrome/renderer/extensions/chrome_v8_extension.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698