Chromium Code Reviews| Index: chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc |
| diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc |
| index fa5f956bc2272cbd8cfc7e5119ae51f62535d9ee..caf6037c5cc2de435a39f3a593818aaca2140dce 100644 |
| --- a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc |
| +++ b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc |
| @@ -4,30 +4,22 @@ |
| #include "chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h" |
| -#include "base/logging.h" |
| +#include "base/bind.h" |
| #include "base/values.h" |
| -#include "content/public/browser/notification_details.h" |
| -#include "content/public/browser/notification_service.h" |
| -#include "content/public/browser/notification_source.h" |
| -#include "content/public/browser/notification_types.h" |
| #include "content/public/browser/web_ui.h" |
| -UserActionsUIHandler::UserActionsUIHandler() : NotificationObserver() { |
| - registrar_.Add(this, |
| - content::NOTIFICATION_USER_ACTION, |
| - content::NotificationService::AllSources()); |
| +UserActionsUIHandler::UserActionsUIHandler() { |
| + content::AddActionCallback(base::Bind(&UserActionsUIHandler::OnUserAction, |
| + base::Unretained(this))); |
| } |
| UserActionsUIHandler::~UserActionsUIHandler() { |
| + content::RemoveActionCallback(base::Bind(&UserActionsUIHandler::OnUserAction, |
| + base::Unretained(this))); |
|
jam
2013/01/30 17:53:24
same comment as the other cl about this not workin
|
| } |
| -void UserActionsUIHandler::Observe( |
| - int type, |
| - const content::NotificationSource& source, |
| - const content::NotificationDetails& details) { |
| - DCHECK_EQ(type, content::NOTIFICATION_USER_ACTION); |
| - base::StringValue user_action_name( |
| - *content::Details<const char*>(details).ptr()); |
| +void UserActionsUIHandler::OnUserAction(const std::string& action) { |
| + base::StringValue user_action_name(action); |
| web_ui()->CallJavascriptFunction("userActions.observeUserAction", |
| user_action_name); |
| } |