base::Bind: More converts, mostly in WebUI.

chrome/browser/ui/webui/bug_report_ui.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/bug_report_ui.h"
 
 #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"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bug_report_data.h"
 #include "chrome/browser/bug_report_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 360 matching lines @@
   }
 
   // Setup the screenshot source after we've verified input is legit.
   SetupScreenshotsSource();
 
   return true;
 }
 
 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*) {
   // Will delete itself when bug_report_data_->SendReport() is called.
   bug_report_data_ = new BugReportData();
 
   // send back values which the dialog js needs initially
   ListValue dialog_defaults;
 
   // 0: current url
   if (target_tab_url_.length())
     dialog_defaults.Append(new StringValue(target_tab_url_));
   else
     dialog_defaults.Append(new StringValue(""));
 
 #if defined(OS_CHROMEOS)
   // 1: about:system
   dialog_defaults.Append(new StringValue(chrome::kChromeUISystemInfoURL));
   // Trigger the request for system information here.
   chromeos::system::SyslogsProvider* provider =
       chromeos::system::SyslogsProvider::GetInstance();
   if (provider) {
     syslogs_handle_ = provider->RequestSyslogs(
         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()));
 #endif
 
   web_ui_->CallJavascriptFunction("setupDialogDefaults", dialog_defaults);
 }
 
 void BugReportHandler::HandleRefreshCurrentScreenshot(const ListValue*) {
   std::string current_screenshot(kCurrentScreenshotUrl);
@@ skipping 167 matching lines @@
   AddMessageHandler((handler)->Attach(this));
 
   // The handler's init will determine whether we show the error html page.
   ChromeWebUIDataSource* html_source =
       CreateBugReportUIHTMLSource(handler->Init());
 
   // Set up the chrome://bugreport/ source.
   Profile* profile = Profile::FromBrowserContext(tab->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }