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

Side by Side Diff: chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc

Issue 2510753002: Revert of Make printing work better with OOPIF. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } // namespace 44 } // namespace
45 45
46 class PrintPreviewUIUnitTest : public PrintPreviewTest { 46 class PrintPreviewUIUnitTest : public PrintPreviewTest {
47 public: 47 public:
48 PrintPreviewUIUnitTest(); 48 PrintPreviewUIUnitTest();
49 ~PrintPreviewUIUnitTest() override; 49 ~PrintPreviewUIUnitTest() override;
50 50
51 protected: 51 protected:
52 void SetUp() override; 52 void SetUp() override;
53 53
54 private:
55 DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIUnitTest); 54 DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIUnitTest);
56 }; 55 };
57 56
58 PrintPreviewUIUnitTest::PrintPreviewUIUnitTest() {} 57 PrintPreviewUIUnitTest::PrintPreviewUIUnitTest() {}
59 PrintPreviewUIUnitTest::~PrintPreviewUIUnitTest() {} 58 PrintPreviewUIUnitTest::~PrintPreviewUIUnitTest() {}
60 59
61 void PrintPreviewUIUnitTest::SetUp() { 60 void PrintPreviewUIUnitTest::SetUp() {
62 PrintPreviewTest::SetUp(); 61 PrintPreviewTest::SetUp();
63 62
64 chrome::NewTab(browser()); 63 chrome::NewTab(browser());
65 } 64 }
66 65
67 // Create/Get a preview tab for initiator. 66 // Create/Get a preview tab for initiator.
68 TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) { 67 TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
69 WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents(); 68 WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
70 ASSERT_TRUE(initiator); 69 ASSERT_TRUE(initiator);
71 EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator)); 70 EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator));
72 71
73 printing::PrintPreviewDialogController* controller = 72 printing::PrintPreviewDialogController* controller =
74 printing::PrintPreviewDialogController::GetInstance(); 73 printing::PrintPreviewDialogController::GetInstance();
75 ASSERT_TRUE(controller); 74 ASSERT_TRUE(controller);
76 75
77 printing::PrintViewManager* print_view_manager = 76 printing::PrintViewManager* print_view_manager =
78 printing::PrintViewManager::FromWebContents(initiator); 77 printing::PrintViewManager::FromWebContents(initiator);
79 print_view_manager->PrintPreviewNow(initiator->GetMainFrame(), false); 78 print_view_manager->PrintPreviewNow(false);
80 WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator); 79 WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
81 80
82 EXPECT_NE(initiator, preview_dialog); 81 EXPECT_NE(initiator, preview_dialog);
83 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 82 EXPECT_EQ(1, browser()->tab_strip_model()->count());
84 EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator)); 83 EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
85 84
86 PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>( 85 PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
87 preview_dialog->GetWebUI()->GetController()); 86 preview_dialog->GetWebUI()->GetController());
88 ASSERT_TRUE(preview_ui != NULL); 87 ASSERT_TRUE(preview_ui != NULL);
89 88
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) { 121 TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
123 WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents(); 122 WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
124 ASSERT_TRUE(initiator); 123 ASSERT_TRUE(initiator);
125 124
126 printing::PrintPreviewDialogController* controller = 125 printing::PrintPreviewDialogController* controller =
127 printing::PrintPreviewDialogController::GetInstance(); 126 printing::PrintPreviewDialogController::GetInstance();
128 ASSERT_TRUE(controller); 127 ASSERT_TRUE(controller);
129 128
130 printing::PrintViewManager* print_view_manager = 129 printing::PrintViewManager* print_view_manager =
131 printing::PrintViewManager::FromWebContents(initiator); 130 printing::PrintViewManager::FromWebContents(initiator);
132 print_view_manager->PrintPreviewNow(initiator->GetMainFrame(), false); 131 print_view_manager->PrintPreviewNow(false);
133 WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator); 132 WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
134 133
135 EXPECT_NE(initiator, preview_dialog); 134 EXPECT_NE(initiator, preview_dialog);
136 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 135 EXPECT_EQ(1, browser()->tab_strip_model()->count());
137 EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator)); 136 EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
138 137
139 PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>( 138 PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
140 preview_dialog->GetWebUI()->GetController()); 139 preview_dialog->GetWebUI()->GetController());
141 ASSERT_TRUE(preview_ui != NULL); 140 ASSERT_TRUE(preview_ui != NULL);
142 141
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) { 181 TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
183 WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents(); 182 WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
184 ASSERT_TRUE(initiator); 183 ASSERT_TRUE(initiator);
185 184
186 printing::PrintPreviewDialogController* controller = 185 printing::PrintPreviewDialogController* controller =
187 printing::PrintPreviewDialogController::GetInstance(); 186 printing::PrintPreviewDialogController::GetInstance();
188 ASSERT_TRUE(controller); 187 ASSERT_TRUE(controller);
189 188
190 printing::PrintViewManager* print_view_manager = 189 printing::PrintViewManager* print_view_manager =
191 printing::PrintViewManager::FromWebContents(initiator); 190 printing::PrintViewManager::FromWebContents(initiator);
192 print_view_manager->PrintPreviewNow(initiator->GetMainFrame(), false); 191 print_view_manager->PrintPreviewNow(false);
193 WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator); 192 WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
194 193
195 EXPECT_NE(initiator, preview_dialog); 194 EXPECT_NE(initiator, preview_dialog);
196 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 195 EXPECT_EQ(1, browser()->tab_strip_model()->count());
197 EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator)); 196 EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
198 197
199 PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>( 198 PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
200 preview_dialog->GetWebUI()->GetController()); 199 preview_dialog->GetWebUI()->GetController());
201 ASSERT_TRUE(preview_ui != NULL); 200 ASSERT_TRUE(preview_ui != NULL);
202 201
(...skipping 24 matching lines...) Expand all
227 cancel = false; 226 cancel = false;
228 preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kFirstRequestId, 227 preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kFirstRequestId,
229 &cancel); 228 &cancel);
230 EXPECT_TRUE(cancel); 229 EXPECT_TRUE(cancel);
231 230
232 cancel = true; 231 cancel = true;
233 preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kSecondRequestId, 232 preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kSecondRequestId,
234 &cancel); 233 &cancel);
235 EXPECT_FALSE(cancel); 234 EXPECT_FALSE(cancel);
236 } 235 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_handler.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698