diff options
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 8fe6a40..b9ee42f 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -1176,7 +1176,7 @@ void TestingAutomationProvider::GetShelfVisibility(int handle, bool* visible) { Browser* browser = browser_tracker_->GetResource(handle); if (browser) { #if defined(OS_CHROMEOS) - *visible = ActiveDownloadsUI::GetPopup(browser->profile()); + *visible = ActiveDownloadsUI::GetPopup(); #else *visible = browser->window()->IsDownloadShelfVisible(); #endif @@ -2013,7 +2013,7 @@ void TestingAutomationProvider::SetShelfVisibility(int handle, bool visible) { if (browser) { #if defined(OS_CHROMEOS) Browser* popup_browser = - ActiveDownloadsUI::GetPopup(browser->profile()); + ActiveDownloadsUI::GetPopup(); if (!popup_browser && visible) ActiveDownloadsUI::OpenPopup(browser->profile()); if (popup_browser && !visible) diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index a486ae8..944e18f 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -783,7 +783,7 @@ class DownloadTest : public InProcessBrowserTest { bool expected_chromeos) { #if defined(OS_CHROMEOS) EXPECT_EQ(expected_chromeos, - NULL != ActiveDownloadsUI::GetPopup(browser->profile())); + NULL != ActiveDownloadsUI::GetPopup()); #else EXPECT_EQ(expected_non_chromeos, browser->window()->IsDownloadShelfVisible()); diff --git a/chrome/browser/ui/webui/active_downloads_ui.cc b/chrome/browser/ui/webui/active_downloads_ui.cc index 39522b3..9b8a78f 100644 --- a/chrome/browser/ui/webui/active_downloads_ui.cc +++ b/chrome/browser/ui/webui/active_downloads_ui.cc @@ -390,7 +390,7 @@ ActiveDownloadsUI::ActiveDownloadsUI(TabContents* contents) // static Browser* ActiveDownloadsUI::OpenPopup(Profile* profile) { - Browser* browser = GetPopup(profile); + Browser* browser = GetPopup(); // Create new browser if no matching pop up is found. if (browser == NULL) { @@ -416,7 +416,7 @@ Browser* ActiveDownloadsUI::OpenPopup(Profile* profile) { return browser; } -Browser* ActiveDownloadsUI::GetPopup(Profile* profile) { +Browser* ActiveDownloadsUI::GetPopup() { for (BrowserList::const_iterator it = BrowserList::begin(); it != BrowserList::end(); ++it) { diff --git a/chrome/browser/ui/webui/active_downloads_ui.h b/chrome/browser/ui/webui/active_downloads_ui.h index 1f27d04..136ea65 100644 --- a/chrome/browser/ui/webui/active_downloads_ui.h +++ b/chrome/browser/ui/webui/active_downloads_ui.h @@ -24,7 +24,7 @@ class ActiveDownloadsUI : public HtmlDialogUI { explicit ActiveDownloadsUI(TabContents* contents); static Browser* OpenPopup(Profile* profile); - static Browser* GetPopup(Profile* profile); + static Browser* GetPopup(); // For testing. typedef std::vector<DownloadItem*> DownloadList; |