Merge 95567 - WebUI TaskManager: make it default on Chrome OS

chrome/browser/ui/webui/task_manager_dialog.cc

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