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

Unified Diff: chrome/browser/ui/webui/print_preview_ui_unittest.cc

Issue 8136027: Print Preview: Make print preview tab modal. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: do not listen for F1 key in JS Created 9 years, 2 months 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
Index: chrome/browser/ui/webui/print_preview_ui_unittest.cc
===================================================================
--- chrome/browser/ui/webui/print_preview_ui_unittest.cc (revision 105366)
+++ chrome/browser/ui/webui/print_preview_ui_unittest.cc (working copy)
@@ -8,6 +8,7 @@
#include "base/memory/ref_counted_memory.h"
#include "chrome/browser/printing/print_preview_tab_controller.h"
#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/constrained_window_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/webui/print_preview_ui.h"
#include "chrome/common/chrome_switches.h"
@@ -21,6 +22,10 @@
const unsigned char blob1[] =
"12346102356120394751634516591348710478123649165419234519234512349134";
+size_t GetConstrainedWindowCount(TabContentsWrapper* tab) {
+ return tab->constrained_window_tab_helper()->constrained_window_count();
+}
+
} // namespace
typedef BrowserWithTestWindowTest PrintPreviewUITest;
@@ -45,7 +50,7 @@
controller->GetOrCreatePreviewTab(initiator_tab);
EXPECT_NE(initiator_tab, preview_tab);
- EXPECT_EQ(2, browser()->tab_count());
+ EXPECT_EQ(1, browser()->tab_count());
PrintPreviewUI* preview_ui =
reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
@@ -105,7 +110,8 @@
controller->GetOrCreatePreviewTab(initiator_tab);
EXPECT_NE(initiator_tab, preview_tab);
- EXPECT_EQ(2, browser()->tab_count());
+ EXPECT_EQ(1, browser()->tab_count());
+ EXPECT_EQ(1U, GetConstrainedWindowCount(initiator_tab));
PrintPreviewUI* preview_ui =
reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
@@ -172,7 +178,8 @@
controller->GetOrCreatePreviewTab(initiator_tab);
EXPECT_NE(initiator_tab, preview_tab);
- EXPECT_EQ(2, browser()->tab_count());
+ EXPECT_EQ(1, browser()->tab_count());
+ EXPECT_EQ(1U, GetConstrainedWindowCount(initiator_tab));
PrintPreviewUI* preview_ui =
reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());

Powered by Google App Engine
This is Rietveld 408576698