| Index: chrome/browser/ui/webui/bug_report_ui.cc
|
| diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
|
| index 897997f4d50b1d960629fdfd54a4f29f6d7a99ac..1218089fdfece7598068a88640d104fb18e24692 100644
|
| --- a/chrome/browser/ui/webui/bug_report_ui.cc
|
| +++ b/chrome/browser/ui/webui/bug_report_ui.cc
|
| @@ -6,7 +6,8 @@
|
|
|
| #include <vector>
|
|
|
| -#include "base/callback.h"
|
| +#include "base/bind.h"
|
| +#include "base/bind_helpers.h"
|
| #include "base/logging.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop.h"
|
| @@ -387,19 +388,25 @@ bool BugReportHandler::Init() {
|
|
|
| void BugReportHandler::RegisterMessages() {
|
| web_ui_->RegisterMessageCallback("getDialogDefaults",
|
| - NewCallback(this, &BugReportHandler::HandleGetDialogDefaults));
|
| + base::Bind(&BugReportHandler::HandleGetDialogDefaults,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("refreshCurrentScreenshot",
|
| - NewCallback(this, &BugReportHandler::HandleRefreshCurrentScreenshot));
|
| + base::Bind(&BugReportHandler::HandleRefreshCurrentScreenshot,
|
| + base::Unretained(this)));
|
| #if defined(OS_CHROMEOS)
|
| web_ui_->RegisterMessageCallback("refreshSavedScreenshots",
|
| - NewCallback(this, &BugReportHandler::HandleRefreshSavedScreenshots));
|
| + base::Bind(&BugReportHandler::HandleRefreshSavedScreenshots,
|
| + base::Unretained(this)));
|
| #endif
|
| web_ui_->RegisterMessageCallback("sendReport",
|
| - NewCallback(this, &BugReportHandler::HandleSendReport));
|
| + base::Bind(&BugReportHandler::HandleSendReport,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("cancel",
|
| - NewCallback(this, &BugReportHandler::HandleCancel));
|
| + base::Bind(&BugReportHandler::HandleCancel,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("openSystemTab",
|
| - NewCallback(this, &BugReportHandler::HandleOpenSystemTab));
|
| + base::Bind(&BugReportHandler::HandleOpenSystemTab,
|
| + base::Unretained(this)));
|
| }
|
|
|
| void BugReportHandler::HandleGetDialogDefaults(const ListValue*) {
|
| @@ -426,7 +433,8 @@ void BugReportHandler::HandleGetDialogDefaults(const ListValue*) {
|
| true, // don't compress.
|
| chromeos::system::SyslogsProvider::SYSLOGS_FEEDBACK,
|
| &syslogs_consumer_,
|
| - NewCallback(bug_report_data_, &BugReportData::SyslogsComplete));
|
| + base::Bind(&BugReportData::SyslogsComplete,
|
| + base::Unretained(bug_report_data_)));
|
| }
|
| // 2: user e-mail
|
| dialog_defaults.Append(new StringValue(GetUserEmail()));
|
|
|