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

chrome/browser/ui/webui/options/chromeos/about_page_handler.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/options/chromeos/about_page_handler.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/cros/update_library.h"
@@ skipping 219 matching lines @@
 
   web_ui_->RegisterMessageCallback("CheckNow",
       NewCallback(this, &AboutPageHandler::CheckNow));
   web_ui_->RegisterMessageCallback("RestartNow",
       NewCallback(this, &AboutPageHandler::RestartNow));
 }
 
 void AboutPageHandler::PageReady(const ListValue* args) {
   // Version information is loaded from a callback
   loader_.GetVersion(&consumer_,
-                     NewCallback(this, &AboutPageHandler::OnOSVersion),
+                     base::Bind(&AboutPageHandler::OnOSVersion,
+                                base::Unretained(this)),
                      VersionLoader::VERSION_FULL);
   loader_.GetFirmware(&consumer_,
-                      NewCallback(this, &AboutPageHandler::OnOSFirmware));
+                      base::Bind(&AboutPageHandler::OnOSFirmware,
+                                 base::Unretained(this)));
 
   UpdateLibrary* update_library =
       CrosLibrary::Get()->GetUpdateLibrary();
 
   update_observer_.reset(new UpdateObserver(this));
   update_library->AddObserver(update_observer_.get());
 
   // Update the WebUI page with the current status. See comments below.
   UpdateStatus(update_library->status());
 
@@ skipping 147 matching lines @@
   if (CrosLibrary::Get()->GetUpdateLibrary()->HasObserver(observer)) {
     // If UpdateLibrary still has the observer, then the page handler is valid.
     AboutPageHandler* handler = observer->page_handler();
     scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));
     handler->web_ui_->CallJavascriptFunction(
         "AboutPage.updateSelectedOptionCallback", *channel_string);
   }
 }
 
 } // namespace chromeos