Index: chrome/browser/extensions/api/processes/processes_api.cc |
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc |
index 657a3bc6291c4e38cf1b58398276ae363bb60a0a..ce9d44bedf88adeb19d1f40bb52ae790d819de6f 100644 |
--- a/chrome/browser/extensions/api/processes/processes_api.cc |
+++ b/chrome/browser/extensions/api/processes/processes_api.cc |
@@ -19,9 +19,9 @@ |
#include "chrome/browser/extensions/extension_function_util.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/extension_tab_util.h" |
-#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/task_manager/resource_provider.h" |
#include "chrome/browser/task_manager/task_manager.h" |
+#include "content/public/browser/browser_context.h" |
#include "content/public/browser/notification_details.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_source.h" |
@@ -212,10 +212,8 @@ void AddMemoryDetails(base::DictionaryValue* result, |
} // namespace |
-ProcessesEventRouter::ProcessesEventRouter(Profile* profile) |
- : profile_(profile), |
- listeners_(0), |
- task_manager_listening_(false) { |
+ProcessesEventRouter::ProcessesEventRouter(content::BrowserContext* context) |
+ : browser_context_(context), listeners_(0), task_manager_listening_(false) { |
#if defined(ENABLE_TASK_MANAGER) |
model_ = TaskManager::GetInstance()->model(); |
model_->AddObserver(this); |
@@ -469,26 +467,28 @@ void ProcessesEventRouter::ProcessClosedEvent( |
void ProcessesEventRouter::DispatchEvent( |
const std::string& event_name, |
scoped_ptr<base::ListValue> event_args) { |
- if (extensions::ExtensionSystem::Get(profile_)->event_router()) { |
+ if (extensions::ExtensionSystem::Get(browser_context_)->event_router()) { |
scoped_ptr<extensions::Event> event(new extensions::Event( |
event_name, event_args.Pass())); |
- extensions::ExtensionSystem::Get(profile_)->event_router()-> |
- BroadcastEvent(event.Pass()); |
+ extensions::ExtensionSystem::Get(browser_context_) |
+ ->event_router() |
+ ->BroadcastEvent(event.Pass()); |
} |
} |
bool ProcessesEventRouter::HasEventListeners(const std::string& event_name) { |
extensions::EventRouter* router = |
- extensions::ExtensionSystem::Get(profile_)->event_router(); |
+ extensions::ExtensionSystem::Get(browser_context_)->event_router(); |
if (router && router->HasEventListener(event_name)) |
return true; |
return false; |
} |
-ProcessesAPI::ProcessesAPI(Profile* profile) : profile_(profile) { |
- ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( |
+ProcessesAPI::ProcessesAPI(content::BrowserContext* context) |
+ : browser_context_(context) { |
+ ExtensionSystem::Get(browser_context_)->event_router()->RegisterObserver( |
this, processes_api_constants::kOnUpdated); |
- ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( |
+ ExtensionSystem::Get(browser_context_)->event_router()->RegisterObserver( |
this, processes_api_constants::kOnUpdatedWithMemory); |
ExtensionFunctionRegistry* registry = |
ExtensionFunctionRegistry::GetInstance(); |
@@ -501,7 +501,8 @@ ProcessesAPI::~ProcessesAPI() { |
} |
void ProcessesAPI::Shutdown() { |
- ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this); |
+ ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver( |
+ this); |
} |
static base::LazyInstance<ProfileKeyedAPIFactory<ProcessesAPI> > |
@@ -513,13 +514,13 @@ ProfileKeyedAPIFactory<ProcessesAPI>* ProcessesAPI::GetFactoryInstance() { |
} |
// static |
-ProcessesAPI* ProcessesAPI::Get(Profile* profile) { |
- return ProfileKeyedAPIFactory<ProcessesAPI>::GetForProfile(profile); |
+ProcessesAPI* ProcessesAPI::Get(content::BrowserContext* context) { |
+ return ProfileKeyedAPIFactory<ProcessesAPI>::GetForProfile(context); |
} |
ProcessesEventRouter* ProcessesAPI::processes_event_router() { |
if (!processes_event_router_) |
- processes_event_router_.reset(new ProcessesEventRouter(profile_)); |
+ processes_event_router_.reset(new ProcessesEventRouter(browser_context_)); |
return processes_event_router_.get(); |
} |