Index: chrome/renderer/render_thread.cc |
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc |
index 5aa1dc6f7d1ff6925e09c0356008ccb663807dbc..311e8653be7d767be5ba1bd1522984068462ac05 100644 |
--- a/chrome/renderer/render_thread.cc |
+++ b/chrome/renderer/render_thread.cc |
@@ -13,9 +13,9 @@ |
#include "chrome/common/notification_service.h" |
#include "chrome/plugin/plugin_channel.h" |
#include "chrome/renderer/net/render_dns_master.h" |
-#include "chrome/renderer/greasemonkey_slave.h" |
#include "chrome/renderer/render_process.h" |
#include "chrome/renderer/render_view.h" |
+#include "chrome/renderer/user_script_slave.h" |
#include "chrome/renderer/visitedlink_slave.h" |
#include "webkit/glue/cache_manager.h" |
@@ -34,7 +34,7 @@ RenderThread::RenderThread(const std::wstring& channel_name) |
channel_name_(channel_name), |
owner_loop_(MessageLoop::current()), |
visited_link_slave_(NULL), |
- greasemonkey_slave_(NULL), |
+ user_script_slave_(NULL), |
render_dns_master_(NULL), |
in_send_(0) { |
DCHECK(owner_loop_); |
@@ -105,7 +105,7 @@ void RenderThread::Init() { |
CoInitialize(0); |
visited_link_slave_ = new VisitedLinkSlave(); |
- greasemonkey_slave_ = new GreasemonkeySlave(); |
+ user_script_slave_ = new UserScriptSlave(); |
render_dns_master_.reset(new RenderDnsMaster()); |
@@ -134,8 +134,8 @@ void RenderThread::CleanUp() { |
delete visited_link_slave_; |
visited_link_slave_ = NULL; |
- delete greasemonkey_slave_; |
- greasemonkey_slave_ = NULL; |
+ delete user_script_slave_; |
+ user_script_slave_ = NULL; |
CoUninitialize(); |
} |
@@ -145,10 +145,10 @@ void RenderThread::OnUpdateVisitedLinks(base::SharedMemoryHandle table) { |
visited_link_slave_->Init(table); |
} |
-void RenderThread::OnUpdateGreasemonkeyScripts( |
+void RenderThread::OnUpdateUserScripts( |
base::SharedMemoryHandle scripts) { |
DCHECK(scripts) << "Bad scripts handle"; |
- greasemonkey_slave_->UpdateScripts(scripts); |
+ user_script_slave_->UpdateScripts(scripts); |
} |
void RenderThread::OnMessageReceived(const IPC::Message& msg) { |
@@ -165,8 +165,8 @@ void RenderThread::OnMessageReceived(const IPC::Message& msg) { |
IPC_MESSAGE_HANDLER(ViewMsg_GetCacheResourceStats, |
OnGetCacheResourceStats) |
IPC_MESSAGE_HANDLER(ViewMsg_PluginMessage, OnPluginMessage) |
- IPC_MESSAGE_HANDLER(ViewMsg_Greasemonkey_NewScripts, |
- OnUpdateGreasemonkeyScripts) |
+ IPC_MESSAGE_HANDLER(ViewMsg_UserScripts_NewScripts, |
+ OnUpdateUserScripts) |
// send the rest to the router |
IPC_MESSAGE_UNHANDLED(router_.OnMessageReceived(msg)) |
IPC_END_MESSAGE_MAP() |