Support for re-using open tabs

chrome/browser/ui/webui/active_downloads_ui.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/active_downloads_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/mediaplayer_ui.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/browser_resources.h"
@@ skipping 59 matching lines @@
   virtual void OnDownloadOpened(DownloadItem* item) { }
 
   // DownloadManager::Observer interface.
   virtual void ModelChanged();
 
   // WebUI Callbacks.
   void HandleGetDownloads(const ListValue* args);
   void HandlePauseToggleDownload(const ListValue* args);
   void HandleCancelDownload(const ListValue* args);
   void HandleAllowDownload(const ListValue* args);
-  void OpenNewPopupWindow(const ListValue* args);
   void OpenNewFullWindow(const ListValue* args);
   void PlayMediaFile(const ListValue* args);
 
  private:
   // Downloads helpers.
   DownloadItem* GetDownloadById(const ListValue* args);
   void UpdateDownloadList();
   void SendDownloads();
   void AddDownload(DownloadItem* item);
-
-  void OpenNewWindow(const ListValue* args, bool popup);
+  bool SelectTab(const GURL& url);
 
   Profile* profile_;
   TabContents* tab_contents_;
   DownloadManager* download_manager_;
 
   typedef std::vector<DownloadItem*> DownloadList;
   DownloadList active_downloads_;
   DownloadList downloads_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveDownloadsHandler);
@@ skipping 88 matching lines @@
 
 void ActiveDownloadsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getDownloads",
       NewCallback(this, &ActiveDownloadsHandler::HandleGetDownloads));
   web_ui_->RegisterMessageCallback("pauseToggleDownload",
       NewCallback(this, &ActiveDownloadsHandler::HandlePauseToggleDownload));
   web_ui_->RegisterMessageCallback("cancelDownload",
       NewCallback(this, &ActiveDownloadsHandler::HandleCancelDownload));
   web_ui_->RegisterMessageCallback("allowDownload",
       NewCallback(this, &ActiveDownloadsHandler::HandleAllowDownload));
-  web_ui_->RegisterMessageCallback("openNewPopupWindow",
-      NewCallback(this, &ActiveDownloadsHandler::OpenNewPopupWindow));
   web_ui_->RegisterMessageCallback("openNewFullWindow",
       NewCallback(this, &ActiveDownloadsHandler::OpenNewFullWindow));
   web_ui_->RegisterMessageCallback("playMediaFile",
       NewCallback(this, &ActiveDownloadsHandler::PlayMediaFile));
 }
 
 void ActiveDownloadsHandler::PlayMediaFile(const ListValue* args) {
   FilePath file_path(UTF16ToUTF8(ExtractStringValue(args)));
 
   Browser* browser = Browser::GetBrowserForController(
@@ skipping 25 matching lines @@
 
 void ActiveDownloadsHandler::HandleCancelDownload(const ListValue* args) {
   DownloadItem* item = GetDownloadById(args);
   if (item) {
     if (item->IsPartialDownload())
       item->Cancel(true);
     item->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
   }
 }
 
-void ActiveDownloadsHandler::OpenNewFullWindow(const ListValue* args) {
-  OpenNewWindow(args, false);
+bool ActiveDownloadsHandler::SelectTab(const GURL& url) {
+  for (TabContentsIterator it; !it.done(); ++it) {
+    TabContents* tab_contents = it->tab_contents();
+    if (tab_contents->GetURL() == url) {
+      tab_contents->Activate();
+      return true;
+    }
+  }
+  return false;
 }
 
-void ActiveDownloadsHandler::OpenNewPopupWindow(const ListValue* args) {
-  OpenNewWindow(args, true);
-}
+void ActiveDownloadsHandler::OpenNewFullWindow(const ListValue* args) {
+  std::string url = UTF16ToUTF8(ExtractStringValue(args));
 
-void ActiveDownloadsHandler::OpenNewWindow(const ListValue* args, bool popup) {
-  std::string url = UTF16ToUTF8(ExtractStringValue(args));
-  Browser* browser = popup ?
-      Browser::CreateForApp(Browser::TYPE_PANEL, kActiveDownloadAppName,
-                            gfx::Size(), profile_) :
-      BrowserList::GetLastActive();
+  if (SelectTab(GURL(url)))
+    return;
+
+  Browser* browser = BrowserList::GetLastActive();
   browser::NavigateParams params(browser, GURL(url), PageTransition::LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   browser::Navigate(&params);
-  // TODO(beng): The following two calls should be automatic by Navigate().
-  if (popup)
-    params.browser->window()->SetBounds(gfx::Rect(0, 0, 400, 300));
-  params.browser->window()->Show();
+  browser->window()->Show();
 }
 
 void ActiveDownloadsHandler::ModelChanged() {
   UpdateDownloadList();
 }
 
 void ActiveDownloadsHandler::HandleGetDownloads(const ListValue* args) {
   UpdateDownloadList();
 }
 
@@ skipping 85 matching lines @@
     browser = Browser::CreateForApp(Browser::TYPE_PANEL, kActiveDownloadAppName,
                                     gfx::Size(), profile);
 
     browser::NavigateParams params(
         browser,
         GURL(chrome::kChromeUIActiveDownloadsURL),
         PageTransition::LINK);
     params.disposition = NEW_FOREGROUND_TAB;
     browser::Navigate(&params);
 
+    DCHECK_EQ(browser, params.browser);
     // TODO(beng): The following two calls should be automatic by Navigate().
-    params.browser->window()->SetBounds(gfx::Rect(kPopupLeft,
-                                                  kPopupTop,
-                                                  kPopupWidth,
-                                                  kPopupHeight));
-    params.browser->window()->Show();
-  } else {
-    browser->window()->Show();
+    browser->window()->SetBounds(gfx::Rect(kPopupLeft,
+                                           kPopupTop,
+                                           kPopupWidth,
+                                           kPopupHeight));
   }
 
+  browser->window()->Show();
   return browser;
 }
 
 Browser* ActiveDownloadsUI::GetPopup(Profile* profile) {
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end();
        ++it) {
     if ((*it)->is_type_panel() && (*it)->is_app()) {
       TabContents* tab_contents = (*it)->GetSelectedTabContents();
       DCHECK(tab_contents);
       if (!tab_contents)
         continue;
       const GURL& url = tab_contents->GetURL();
 
       if (url.SchemeIs(chrome::kChromeUIScheme) &&
           url.host() == chrome::kChromeUIActiveDownloadsHost &&
           (*it)->profile() == profile) {
         return (*it);
       }
     }
   }
   return NULL;
 }