| Index: chrome/browser/ui/webui/active_downloads_ui.cc
|
| diff --git a/chrome/browser/ui/webui/active_downloads_ui.cc b/chrome/browser/ui/webui/active_downloads_ui.cc
|
| index 65750e649e5f5991f98797983f7330560c5557f4..8073cc3b53be44ec956c29574df801ea07625fcb 100644
|
| --- a/chrome/browser/ui/webui/active_downloads_ui.cc
|
| +++ b/chrome/browser/ui/webui/active_downloads_ui.cc
|
| @@ -369,33 +369,6 @@ ActiveDownloadsUI::ActiveDownloadsUI(TabContents* contents)
|
| CreateActiveDownloadsUIHTMLSource());
|
| }
|
|
|
| -#if defined(TOUCH_UI)
|
| -
|
| -// static
|
| -TabContents* ActiveDownloadsUI::OpenPopup(Profile* profile) {
|
| - Browser* browser = Browser::GetOrCreateTabbedBrowser(profile);
|
| - OpenURLParams params(GURL(chrome::kChromeUIActiveDownloadsURL), GURL(),
|
| - SINGLETON_TAB, content::PAGE_TRANSITION_LINK, false);
|
| - TabContents* download_contents = browser->OpenURL(params);
|
| - browser->window()->Show();
|
| - return download_contents;
|
| -}
|
| -
|
| -TabContents* ActiveDownloadsUI::GetPopup(Browser** browser) {
|
| - for (TabContentsIterator it; !it.done(); ++it) {
|
| - TabContents* tab = it->tab_contents();
|
| - const GURL& url = tab->GetURL();
|
| - if (url.SchemeIs(chrome::kChromeUIScheme) &&
|
| - url.host() == chrome::kChromeUIActiveDownloadsHost) {
|
| - if (browser)
|
| - *browser = it.browser();
|
| - return tab;
|
| - }
|
| - }
|
| - return NULL;
|
| -}
|
| -
|
| -#else // defined(TOUCH_UI)
|
| // static
|
| Browser* ActiveDownloadsUI::OpenPopup(Profile* profile) {
|
| Browser* browser = GetPopup();
|
| @@ -443,7 +416,6 @@ Browser* ActiveDownloadsUI::GetPopup() {
|
| }
|
| return NULL;
|
| }
|
| -#endif // defined(TOUCH_UI)
|
|
|
| const ActiveDownloadsUI::DownloadList& ActiveDownloadsUI::GetDownloads() const {
|
| return handler_->downloads();
|
|
|