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

Unified Diff: chrome/browser/profile.cc

Issue 17281: This is a rename of the term 'Greasemonkey' to 'user script' in Chromium. (Closed)
Patch Set: Fix indent Created 11 years, 11 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
« no previous file with comments | « chrome/browser/profile.h ('k') | chrome/browser/render_process_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profile.cc
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 616827585a2bba28df13097439d6ca2210d0509f..b1762f0d58e9ca014cbef0fd63364ad63f330912 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/extensions/extensions_service.h"
-#include "chrome/browser/greasemonkey_master.h"
+#include "chrome/browser/extensions/user_script_master.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/navigation_controller.h"
#include "chrome/browser/net/chrome_url_request_context.h"
@@ -134,8 +134,8 @@ class OffTheRecordProfileImpl : public Profile,
return profile_->GetExtensionsService();
}
- virtual GreasemonkeyMaster* GetGreasemonkeyMaster() {
- return profile_->GetGreasemonkeyMaster();
+ virtual UserScriptMaster* GetUserScriptMaster() {
+ return profile_->GetUserScriptMaster();
}
virtual HistoryService* GetHistoryService(ServiceAccessType sat) {
@@ -448,16 +448,16 @@ ExtensionsService* ProfileImpl::GetExtensionsService() {
return extensions_service_.get();
}
-GreasemonkeyMaster* ProfileImpl::GetGreasemonkeyMaster() {
- if (!greasemonkey_master_.get()) {
+UserScriptMaster* ProfileImpl::GetUserScriptMaster() {
+ if (!user_script_master_.get()) {
std::wstring script_dir = GetPath();
file_util::AppendToPath(&script_dir, chrome::kUserScriptsDirname);
- greasemonkey_master_ =
- new GreasemonkeyMaster(g_browser_process->file_thread()->message_loop(),
- FilePath(script_dir));
+ user_script_master_ =
+ new UserScriptMaster(g_browser_process->file_thread()->message_loop(),
+ FilePath(script_dir));
}
- return greasemonkey_master_.get();
+ return user_script_master_.get();
}
PrefService* ProfileImpl::GetPrefs() {
« no previous file with comments | « chrome/browser/profile.h ('k') | chrome/browser/render_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698