| Index: chrome/renderer/extensions/user_script_slave.cc
|
| diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
|
| index 58f13c6f54ef6f355b2dfdac3810afac01d319b3..f9166632d1a2e6dd75584d013f5ae184aa94ab01 100644
|
| --- a/chrome/renderer/extensions/user_script_slave.cc
|
| +++ b/chrome/renderer/extensions/user_script_slave.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/common/extensions/extension_set.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/renderer/chrome_render_process_observer.h"
|
| -#include "chrome/renderer/extensions/extension_dispatcher.h"
|
| #include "chrome/renderer/extensions/extension_groups.h"
|
| #include "content/public/renderer/render_thread.h"
|
| #include "content/public/renderer/render_view.h"
|
| @@ -50,8 +49,8 @@ namespace extensions {
|
| static const char kUserScriptHead[] = "(function (unsafeWindow) {\n";
|
| static const char kUserScriptTail[] = "\n})(window);";
|
|
|
| -int UserScriptSlave::GetIsolatedWorldIdForExtension(
|
| - const Extension* extension, WebFrame* frame) {
|
| +int UserScriptSlave::GetIsolatedWorldIdForExtension(const Extension* extension,
|
| + WebFrame* frame) {
|
| static int g_next_isolated_world_id = 1;
|
|
|
| IsolatedWorldMap::iterator iter = isolated_world_ids_.find(extension->id());
|
| @@ -89,9 +88,8 @@ std::string UserScriptSlave::GetExtensionIdForIsolatedWorld(
|
| }
|
|
|
| // static
|
| -void UserScriptSlave::InitializeIsolatedWorld(
|
| - int isolated_world_id,
|
| - const Extension* extension) {
|
| +void UserScriptSlave::InitializeIsolatedWorld(int isolated_world_id,
|
| + const Extension* extension) {
|
| const URLPatternSet& permissions =
|
| extension->GetEffectiveHostPermissions();
|
| for (URLPatternSet::const_iterator i = permissions.begin();
|
|
|