Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1399)

Unified Diff: chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

Issue 8667001: Fix Bind usage in imageburner. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc (revision 110982)
+++ chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc (working copy)
@@ -3,17 +3,19 @@
// found in the LICENSE file.
#include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
-#include "chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h"
+#include <string>
+#include <vector>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/i18n/rtl.h"
#include "base/message_loop.h"
-#include "base/task.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/chromeos/system/statistics_provider.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h"
#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/time_format.h"
@@ -47,8 +49,8 @@
namespace {
-ChromeWebUIDataSource *CreateImageburnerUIHTMLSource() {
- ChromeWebUIDataSource *source =
+ChromeWebUIDataSource* CreateImageburnerUIHTMLSource() {
+ ChromeWebUIDataSource* source =
new ChromeWebUIDataSource(chrome::kChromeUIImageBurnerHost);
source->AddLocalizedString("headerTitle", IDS_IMAGEBURN_HEADER_TITLE);
@@ -151,14 +153,17 @@
void WebUIHandler::RegisterMessages() {
web_ui_->RegisterMessageCallback("getDevices",
- base::Bind(&WebUIHandler::HandleGetDevices, base::Unretained(this)));
+ base::Bind(&WebUIHandler::HandleGetDevices,
+ base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
web_ui_->RegisterMessageCallback("burnImage",
- base::Bind(&WebUIHandler::HandleBurnImage, base::Unretained(this)));
+ base::Bind(&WebUIHandler::HandleBurnImage,
+ base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
web_ui_->RegisterMessageCallback("cancelBurnImage",
- base::Bind(&WebUIHandler::HandleCancelBurnImage, base::Unretained(this)));
+ base::Bind(&WebUIHandler::HandleCancelBurnImage,
+ base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
web_ui_->RegisterMessageCallback("webuiInitialized",
base::Bind(&WebUIHandler::HandleWebUIInitialized,
- base::Unretained(this)));
+ base::SupportsWeakPtr<WebUIHandler>::AsWeakPtr()));
}
csilv 2011/11/23 01:39:02 As discussed in http://codereview.chromium.org/811
achuithb 2011/11/23 19:43:29 Done.
void WebUIHandler::DiskChanged(
@@ -359,7 +364,7 @@
scoped_refptr<WebUIHandlerTaskProxy> task = new WebUIHandlerTaskProxy(this);
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
- NewRunnableMethod(task.get(), &WebUIHandlerTaskProxy::CreateImageDir));
+ base::Bind(&WebUIHandlerTaskProxy::CreateImageDir, task));
csilv 2011/11/23 01:39:02 You'll still want to use task.get() here.
achuithb 2011/11/23 19:43:29 Done.
} else {
ImageDirCreatedOnUIThread(true);
}
@@ -376,8 +381,7 @@
scoped_refptr<WebUIHandlerTaskProxy> task = new WebUIHandlerTaskProxy(this);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
- NewRunnableMethod(task.get(), &WebUIHandlerTaskProxy::OnImageDirCreated,
- success));
+ base::Bind(&WebUIHandlerTaskProxy::OnImageDirCreated, task, success));
csilv 2011/11/23 01:39:02 task.get()
achuithb 2011/11/23 19:43:29 Done.
}
void WebUIHandler::ImageDirCreatedOnUIThread(bool success) {
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698