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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 17500003: Close web contents modal dialogs on content load start (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compilation fixes, change "inhibit" variable names Created 7 years, 5 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
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_ui.cc ('k') | chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index 18cdd8081be952a24fe33a8eb0069ea1b457852c..99ad7b9e372ebaf2b78d78f4e92650f6fd68e540 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -62,26 +62,24 @@ void PrintPreviewUIUnitTest::SetUp() {
chrome::NewTab(browser());
}
-// Create/Get a preview tab for initiator tab.
+// Create/Get a preview tab for initiator.
TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
- WebContents* initiator_tab =
- browser()->tab_strip_model()->GetActiveWebContents();
- ASSERT_TRUE(initiator_tab);
- EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator_tab));
+ WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
+ ASSERT_TRUE(initiator);
+ EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator));
printing::PrintPreviewDialogController* controller =
printing::PrintPreviewDialogController::GetInstance();
ASSERT_TRUE(controller);
printing::PrintViewManager* print_view_manager =
- printing::PrintViewManager::FromWebContents(initiator_tab);
+ printing::PrintViewManager::FromWebContents(initiator);
print_view_manager->PrintPreviewNow(false);
- WebContents* preview_dialog =
- controller->GetOrCreatePreviewDialog(initiator_tab);
+ WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
- EXPECT_NE(initiator_tab, preview_dialog);
+ EXPECT_NE(initiator, preview_dialog);
EXPECT_EQ(1, browser()->tab_strip_model()->count());
- EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator_tab));
+ EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
preview_dialog->GetWebUI()->GetController());
@@ -120,23 +118,21 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
// Set and get the individual draft pages.
TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
- WebContents* initiator_tab =
- browser()->tab_strip_model()->GetActiveWebContents();
- ASSERT_TRUE(initiator_tab);
+ WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
+ ASSERT_TRUE(initiator);
printing::PrintPreviewDialogController* controller =
printing::PrintPreviewDialogController::GetInstance();
ASSERT_TRUE(controller);
printing::PrintViewManager* print_view_manager =
- printing::PrintViewManager::FromWebContents(initiator_tab);
+ printing::PrintViewManager::FromWebContents(initiator);
print_view_manager->PrintPreviewNow(false);
- WebContents* preview_dialog =
- controller->GetOrCreatePreviewDialog(initiator_tab);
+ WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
- EXPECT_NE(initiator_tab, preview_dialog);
+ EXPECT_NE(initiator, preview_dialog);
EXPECT_EQ(1, browser()->tab_strip_model()->count());
- EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator_tab));
+ EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
preview_dialog->GetWebUI()->GetController());
@@ -182,23 +178,21 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
// Test the browser-side print preview cancellation functionality.
TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
- WebContents* initiator_tab =
- browser()->tab_strip_model()->GetActiveWebContents();
- ASSERT_TRUE(initiator_tab);
+ WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
+ ASSERT_TRUE(initiator);
printing::PrintPreviewDialogController* controller =
printing::PrintPreviewDialogController::GetInstance();
ASSERT_TRUE(controller);
printing::PrintViewManager* print_view_manager =
- printing::PrintViewManager::FromWebContents(initiator_tab);
+ printing::PrintViewManager::FromWebContents(initiator);
print_view_manager->PrintPreviewNow(false);
- WebContents* preview_dialog =
- controller->GetOrCreatePreviewDialog(initiator_tab);
+ WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
- EXPECT_NE(initiator_tab, preview_dialog);
+ EXPECT_NE(initiator, preview_dialog);
EXPECT_EQ(1, browser()->tab_strip_model()->count());
- EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator_tab));
+ EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
preview_dialog->GetWebUI()->GetController());
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_ui.cc ('k') | chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698