summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/extensions/user_script_slave.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-06 20:34:06 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-06 20:34:06 +0000
commit52647690519017787e65b22941cbd7dd57b42b5f (patch)
treee32377afde4ad1e590123b26fb695cf6f610e6b5 /chrome/renderer/extensions/user_script_slave.cc
parent37d75b246580a34cdcba5430a4df05c1243fd51b (diff)
downloadchromium_src-52647690519017787e65b22941cbd7dd57b42b5f.zip
chromium_src-52647690519017787e65b22941cbd7dd57b42b5f.tar.gz
chromium_src-52647690519017787e65b22941cbd7dd57b42b5f.tar.bz2
Create content::RenderThread interface and make code in chrome use that.
BUG=98716,98375,10837 Review URL: http://codereview.chromium.org/8165013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions/user_script_slave.cc')
-rw-r--r--chrome/renderer/extensions/user_script_slave.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
index 8cc9703..c53789e 100644
--- a/chrome/renderer/extensions/user_script_slave.cc
+++ b/chrome/renderer/extensions/user_script_slave.cc
@@ -19,7 +19,7 @@
#include "chrome/renderer/chrome_render_process_observer.h"
#include "chrome/renderer/extensions/extension_dispatcher.h"
#include "chrome/renderer/extensions/extension_groups.h"
-#include "content/renderer/render_thread.h"
+#include "content/public/renderer/render_thread.h"
#include "googleurl/src/gurl.h"
#include "grit/renderer_resources.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
@@ -38,6 +38,7 @@ using WebKit::WebSecurityPolicy;
using WebKit::WebString;
using WebKit::WebVector;
using WebKit::WebView;
+using content::RenderThread;
// These two strings are injected before and after the Greasemonkey API and
// user script to wrap it in an anonymous scope.
@@ -192,7 +193,7 @@ bool UserScriptSlave::UpdateScripts(base::SharedMemoryHandle shared_memory) {
}
// Push user styles down into WebCore
- RenderThread::current()->EnsureWebKitInitialized();
+ RenderThread::Get()->EnsureWebKitInitialized();
WebView::removeAllUserContent();
for (size_t i = 0; i < scripts_.size(); ++i) {
UserScript* script = scripts_[i];