summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/automation/automation_provider.cc17
-rw-r--r--chrome/browser/automation/automation_provider.h4
-rw-r--r--chrome/browser/download/download_uitest.cc140
-rw-r--r--chrome/browser/tab_contents/navigation_controller.cc4
-rw-r--r--chrome/browser/tab_contents/navigation_controller.h3
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc6
6 files changed, 170 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 8fcdf03..5f51cad 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -328,6 +328,8 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) {
AutomationMsg_NavigateToURLBlockUntilNavigationsComplete,
NavigateToURLBlockUntilNavigationsComplete)
IPC_MESSAGE_HANDLER(AutomationMsg_NavigationAsync, NavigationAsync)
+ IPC_MESSAGE_HANDLER(AutomationMsg_NavigationAsyncWithDisposition,
+ NavigationAsyncWithDisposition)
IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_GoBack, GoBack)
IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_GoForward, GoForward)
IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_Reload, Reload)
@@ -642,8 +644,17 @@ void AutomationProvider::NavigateToURLBlockUntilNavigationsComplete(
Send(reply_message);
}
-void AutomationProvider::NavigationAsync(int handle, const GURL& url,
- bool* status) {
+void AutomationProvider::NavigationAsync(int handle,
+ const GURL& url,
+ bool* status) {
+ NavigationAsyncWithDisposition(handle, url, CURRENT_TAB, status);
+}
+
+void AutomationProvider::NavigationAsyncWithDisposition(
+ int handle,
+ const GURL& url,
+ WindowOpenDisposition disposition,
+ bool* status) {
*status = false;
if (tab_tracker_->ContainsHandle(handle)) {
@@ -656,7 +667,7 @@ void AutomationProvider::NavigationAsync(int handle, const GURL& url,
if (browser) {
// Don't add any listener unless a callback mechanism is desired.
// TODO(vibhor): Do this if such a requirement arises in future.
- browser->OpenURL(url, GURL(), CURRENT_TAB, PageTransition::TYPED);
+ browser->OpenURL(url, GURL(), disposition, PageTransition::TYPED);
*status = true;
}
}
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index cb07f1c..e4256c0 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -220,6 +220,10 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
int number_of_navigations,
IPC::Message* reply_message);
void NavigationAsync(int handle, const GURL& url, bool* status);
+ void NavigationAsyncWithDisposition(int handle,
+ const GURL& url,
+ WindowOpenDisposition disposition,
+ bool* status);
void GoBack(int handle, IPC::Message* reply_message);
void GoForward(int handle, IPC::Message* reply_message);
void Reload(int handle, IPC::Message* reply_message);
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index 40a5af27..9a29c57 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -325,6 +325,9 @@ TEST_F(DownloadTest, FLAKY_IncognitoDownload) {
ASSERT_EQ(2, window_count);
scoped_refptr<BrowserProxy> incognito(automation()->GetBrowserWindow(1));
ASSERT_TRUE(incognito.get());
+ // Wait for the new tab UI to load.
+ int load_time;
+ ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
// Download something.
FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
@@ -347,4 +350,141 @@ TEST_F(DownloadTest, FLAKY_IncognitoDownload) {
CheckDownload(file);
}
+TEST_F(DownloadTest, DontCloseNewTab1) {
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser.get());
+ int window_count = 0;
+ ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+ ASSERT_EQ(1, window_count);
+ EXPECT_EQ(1, GetTabCount());
+
+ scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
+ ASSERT_TRUE(tab_proxy.get());
+
+ FilePath file1(FILE_PATH_LITERAL("download-test2.html"));
+ ASSERT_TRUE(tab_proxy->NavigateToURLAsyncWithDisposition(
+ URLRequestMockHTTPJob::GetMockUrl(file1),
+ NEW_BACKGROUND_TAB));
+ // We should have two tabs now.
+ WaitUntilTabCount(2);
+}
+
+TEST_F(DownloadTest, CloseNewTab1) {
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser.get());
+ int window_count = 0;
+ ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+ ASSERT_EQ(1, window_count);
+ EXPECT_EQ(1, GetTabCount());
+
+ scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
+ ASSERT_TRUE(tab_proxy.get());
+
+ FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
+ ASSERT_TRUE(tab_proxy->NavigateToURLAsyncWithDisposition(
+ URLRequestMockHTTPJob::GetMockUrl(file),
+ NEW_BACKGROUND_TAB));
+ // When the download starts, we should still have one tab.
+ ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+ EXPECT_EQ(1, GetTabCount());
+
+ CheckDownload(file);
+}
+
+TEST_F(DownloadTest, DontCloseNewTab2) {
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser.get());
+ int window_count = 0;
+ ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+ ASSERT_EQ(1, window_count);
+ EXPECT_EQ(1, GetTabCount());
+
+ scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
+ ASSERT_TRUE(tab_proxy.get());
+
+ ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
+ FilePath(FILE_PATH_LITERAL("download_page1.html")))));
+
+ FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
+ ASSERT_TRUE(tab_proxy->NavigateToURLAsync(GURL("javascript:openNew()")));
+
+ ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+ EXPECT_EQ(2, GetTabCount());
+
+ CheckDownload(file);
+}
+
+TEST_F(DownloadTest, DontCloseNewTab3) {
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser.get());
+ int window_count = 0;
+ ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+ ASSERT_EQ(1, window_count);
+ EXPECT_EQ(1, GetTabCount());
+
+ scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
+ ASSERT_TRUE(tab_proxy.get());
+
+ ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
+ FilePath(FILE_PATH_LITERAL("download_page2.html")))));
+
+ ASSERT_TRUE(tab_proxy->NavigateToURLAsync(GURL("javascript:openNew()")));
+
+ FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
+ ASSERT_TRUE(tab_proxy->NavigateToURLAsync(
+ URLRequestMockHTTPJob::GetMockUrl(file)));
+
+ ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+ EXPECT_EQ(2, GetTabCount());
+
+ CheckDownload(file);
+}
+
+TEST_F(DownloadTest, CloseNewTab2) {
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser.get());
+ int window_count = 0;
+ ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+ ASSERT_EQ(1, window_count);
+ EXPECT_EQ(1, GetTabCount());
+
+ scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
+ ASSERT_TRUE(tab_proxy.get());
+
+ ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
+ FilePath(FILE_PATH_LITERAL("download_page3.html")))));
+
+ FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
+ ASSERT_TRUE(tab_proxy->NavigateToURLAsync(GURL("javascript:openNew()")));
+
+ ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+ EXPECT_EQ(1, GetTabCount());
+
+ CheckDownload(file);
+}
+
+TEST_F(DownloadTest, CloseNewTab3) {
+ scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser.get());
+ int window_count = 0;
+ ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+ ASSERT_EQ(1, window_count);
+ EXPECT_EQ(1, GetTabCount());
+
+ scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
+ ASSERT_TRUE(tab_proxy.get());
+
+ ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
+ FilePath(FILE_PATH_LITERAL("download_page4.html")))));
+
+ FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
+ ASSERT_TRUE(tab_proxy->NavigateToURLAsync(
+ GURL("javascript:document.getElementById('form').submit()")));
+
+ ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+ EXPECT_EQ(1, GetTabCount());
+
+ CheckDownload(file);
+}
+
} // namespace
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index 141712f..c036c31 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -240,6 +240,10 @@ void NavigationController::ContinuePendingReload() {
}
}
+bool NavigationController::IsInitialNavigation() {
+ return last_document_loaded_.is_null();
+}
+
NavigationEntry* NavigationController::GetEntryWithPageID(
SiteInstance* instance, int32 page_id) const {
int index = GetEntryIndexWithPageID(instance, page_id);
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index 16011d3..dbbe8e8 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -407,6 +407,9 @@ class NavigationController {
// Continues a repost that brought up a warning.
void ContinuePendingReload();
+ // Returns true if we are navigating to the URL the tab is opened with.
+ bool IsInitialNavigation();
+
private:
class RestoreHelper;
friend class RestoreHelper;
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index e2744e1..42b8a64 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1113,8 +1113,12 @@ void TabContents::OnStartDownload(DownloadItem* download) {
// Download in a constrained popup is shown in the tab that opened it.
TabContents* tab_contents = delegate()->GetConstrainingContents(this);
- if (tab_contents && tab_contents->delegate())
+ if (tab_contents && tab_contents->delegate()) {
tab_contents->delegate()->OnStartDownload(download);
+ // If the download occurs in a new tab, close it
+ if (controller_.IsInitialNavigation() && (tab_contents == this))
+ delegate()->CloseContents(this);
+ }
}
void TabContents::WillClose(ConstrainedWindow* window) {
generated by cgit v1.1 at 2025-02-01 06:33:10 +0000