Showing Task manager on the foreground window.

chrome/browser/ui/webui/task_manager_dialog.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/task_manager_dialog.h"
 
 #include "base/memory/singleton.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "grit/google_chrome_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_CHROMEOS)
+#include "views/widget/widget.h"
+#endif  // defined(OS_CHROMEOS)
+
 class TaskManagerDialogImpl : public HtmlDialogUIDelegate {
  public:
   TaskManagerDialogImpl();
 
   static void Show();
   static TaskManagerDialogImpl* GetInstance();
 
  protected:
   friend struct DefaultSingletonTraits<TaskManagerDialogImpl>;
   virtual ~TaskManagerDialogImpl();
@@ skipping 19 matching lines @@
   }
   virtual std::string GetDialogArgs() const OVERRIDE {
     return std::string();
   }
   virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE {
     OnCloseDialog();
   }
   virtual void OnCloseContents(TabContents* source, bool* out_close_dialog)
       OVERRIDE {
     *out_close_dialog = true;
-    OnCloseDialog();
   }
   virtual bool ShouldShowDialogTitle() const OVERRIDE {
     return false;
   }
   virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE {
     return true;
   }
 
  private:
   void ShowDialog();
   void OpenHtmlDialog();
 
-  bool is_shown_;
+  int show_count_;
+
+  gfx::NativeWindow window_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerDialogImpl);
 };
 
 // ****************************************************
 
 // static
 TaskManagerDialogImpl* TaskManagerDialogImpl::GetInstance() {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return Singleton<TaskManagerDialogImpl>::get();
 }
 
-TaskManagerDialogImpl::TaskManagerDialogImpl() : is_shown_(false) {
+TaskManagerDialogImpl::TaskManagerDialogImpl() : show_count_(0),
+                                                 window_(NULL) {
 }
 
 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_) {
-    is_shown_ = true;
-    OpenHtmlDialog();
+  if (show_count_ > 0) {
+#if defined(OS_CHROMEOS)
+    // Closes current TaskManager and Opens new one.
+    views::Widget::GetWidgetForNativeWindow(window_)->Close();
+#else
+    return;

[xiyuan, 2011/08/11 16:36:47]

Could we do something to bring up existing task manager on other platforms?
Would window_->Activate() work?

[yoshiki, 2011/08/16 02:13:30]

Done.

+#endif  // defined(OS_CHROMEOS)
   }
+  OpenHtmlDialog();
+  show_count_++;

[xiyuan, 2011/08/11 16:36:47]

nit: ++show_count_;

[yoshiki, 2011/08/16 02:13:30]

Done.

 }
 
 void TaskManagerDialogImpl::OnCloseDialog() {
-  if (is_shown_)
-    is_shown_ = false;
+  if (show_count_ > 0)
+    show_count_--;

[xiyuan, 2011/08/11 16:36:47]

nit: --show_count_;

[yoshiki, 2011/08/16 02:13:30]

Done.

 }
 
 void TaskManagerDialogImpl::OpenHtmlDialog() {
   Browser* browser = BrowserList::GetLastActive();
-  browser->BrowserShowHtmlDialog(this, NULL);
+  window_ = browser->BrowserShowHtmlDialog(this, NULL);
 }
 
 // ****************************************************
 //
 // static
 void TaskManagerDialog::Show() {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(&TaskManagerDialogImpl::Show));
 }