Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6975)

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

Issue 11419277: Fix showing constrained window for uninitialized tabs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
index 75ba703e5dbc68dff06ec8e4b03daf15634eabcb..0390098148abb5ad1cd4fd58f95eafcd8bd321a7 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
@@ -5,8 +5,10 @@
#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h"
#include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/cocoa/browser_window_controller.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ -14,6 +16,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/browser/web_contents.h"
#include "googleurl/src/gurl.h"
+#include "ipc/ipc_message.h"
#include "testing/gmock/include/gmock/gmock.h"
using ::testing::NiceMock;
@@ -83,6 +86,34 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, ShowInInactiveTab) {
dialog.CloseConstrainedWindow();
}
+// If a tab has never been shown then the associated tab view for the web
+// content will not be created. Verify that adding a constrained window to such
+// a tab works correctly.
+IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, ShowInUninitializedTab) {
+ scoped_ptr<content::WebContents> web_contents(content::WebContents::Create(
+ browser()->profile(), NULL, MSG_ROUTING_NONE, NULL));
+ bool was_blocked = false;
+ chrome::AddWebContents(browser(), NULL, web_contents.release(),
+ NEW_BACKGROUND_TAB, gfx::Rect(), false, &was_blocked);
+ content::WebContents* tab2 =
+ browser()->tab_strip_model()->GetWebContentsAt(2);
+ ASSERT_TRUE(tab2);
+ EXPECT_FALSE([tab2->GetNativeView() superview]);
+
+ // Show dialog and verify that it's not visible yet.
+ NiceMock<ConstrainedWindowDelegateMock> delegate;
+ ConstrainedWindowMac2 dialog(&delegate, tab2, sheet_);
+ EXPECT_FALSE([sheet_ isVisible]);
+
+ // Activate the tab and verify that the constrained window is shown.
+ browser()->tab_strip_model()->ActivateTabAt(2, true);
+ EXPECT_TRUE([tab2->GetNativeView() superview]);
+ EXPECT_TRUE([sheet_ isVisible]);
+ EXPECT_EQ(1.0, [sheet_ alphaValue]);
+
+ dialog.CloseConstrainedWindow();
+}
+
// Test that adding a sheet disables tab dragging.
IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, TabDragging) {
NiceMock<ConstrainedWindowDelegateMock> delegate;
« no previous file with comments | « chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698