| Index: chrome/browser/ui/webui/task_manager_dialog.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/task_manager_dialog.cc (revision 95017)
|
| +++ chrome/browser/ui/webui/task_manager_dialog.cc (working copy)
|
| @@ -20,6 +20,8 @@
|
| static void Show();
|
| static TaskManagerDialogImpl* GetInstance();
|
|
|
| + void ShowDialog();
|
| +
|
| protected:
|
| friend struct DefaultSingletonTraits<TaskManagerDialogImpl>;
|
| virtual ~TaskManagerDialogImpl();
|
| @@ -61,7 +63,6 @@
|
| }
|
|
|
| private:
|
| - void ShowDialog();
|
| void OpenHtmlDialog();
|
|
|
| bool is_shown_;
|
| @@ -84,12 +85,6 @@
|
| 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_) {
|
| @@ -112,8 +107,7 @@
|
| //
|
| // static
|
| void TaskManagerDialog::Show() {
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE,
|
| - NewRunnableFunction(&TaskManagerDialogImpl::Show));
|
| + TaskManagerDialogImpl* dialog = TaskManagerDialogImpl::GetInstance();
|
| + dialog->ShowDialog();
|
| }
|
|
|
|
|