Index: chrome/browser/ui/webui/task_manager_dialog.cc |
diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc |
index b42e637cbe83c5e6501b755e471cb8c15156f22d..72e19d9e1faeac12cd1de4c3d503a631f5734781 100644 |
--- a/chrome/browser/ui/webui/task_manager_dialog.cc |
+++ b/chrome/browser/ui/webui/task_manager_dialog.cc |
@@ -20,8 +20,6 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate { |
static void Show(); |
static TaskManagerDialogImpl* GetInstance(); |
- void ShowDialog(); |
- |
protected: |
friend struct DefaultSingletonTraits<TaskManagerDialogImpl>; |
virtual ~TaskManagerDialogImpl(); |
@@ -63,6 +61,7 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate { |
} |
private: |
+ void ShowDialog(); |
void OpenHtmlDialog(); |
bool is_shown_; |
@@ -85,6 +84,12 @@ TaskManagerDialogImpl::TaskManagerDialogImpl() : is_shown_(false) { |
TaskManagerDialogImpl::~TaskManagerDialogImpl() { |
} |
+void TaskManagerDialogImpl::Show() { |
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ TaskManagerDialogImpl* dialog = TaskManagerDialogImpl::GetInstance(); |
+ dialog->ShowDialog(); |
+} |
+ |
void TaskManagerDialogImpl::ShowDialog() { |
// TODO(yoshiki): Brings up existing UI when called with is_shown_ == TRUE |
if (!is_shown_) { |
@@ -107,7 +112,8 @@ void TaskManagerDialogImpl::OpenHtmlDialog() { |
// |
// static |
void TaskManagerDialog::Show() { |
- TaskManagerDialogImpl* dialog = TaskManagerDialogImpl::GetInstance(); |
- dialog->ShowDialog(); |
+ BrowserThread::PostTask( |
+ BrowserThread::UI, FROM_HERE, |
+ NewRunnableFunction(&TaskManagerDialogImpl::Show)); |
} |