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

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

Issue 8515017: Print Preview: Properly handle window.print(). (Closed)
Patch Set: fail instead of crash when 2 views both do window.print() Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/print_preview_handler_unittest.cc ('k') | chrome/common/print_messages.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_ui_unittest.cc
diff --git a/chrome/browser/ui/webui/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
index eac6b805dd27fcaae9d08f21cd8747078ff0a25e..238b7761d924c6de77698658ebb3224a5cb1942b 100644
--- a/chrome/browser/ui/webui/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/memory/ref_counted_memory.h"
#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_view_manager.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"
@@ -54,6 +55,7 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewData) {
printing::PrintPreviewTabController::GetInstance();
ASSERT_TRUE(controller);
+ initiator_tab->print_view_manager()->PrintPreviewNow();
TabContentsWrapper* preview_tab =
controller->GetOrCreatePreviewTab(initiator_tab);
@@ -117,10 +119,11 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewDraftPages) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(initiator_tab);
- scoped_refptr<printing::PrintPreviewTabController>
- controller(new printing::PrintPreviewTabController());
+ printing::PrintPreviewTabController* controller =
+ printing::PrintPreviewTabController::GetInstance();
ASSERT_TRUE(controller);
+ initiator_tab->print_view_manager()->PrintPreviewNow();
TabContentsWrapper* preview_tab =
controller->GetOrCreatePreviewTab(initiator_tab);
@@ -191,10 +194,11 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_GetCurrentPrintPreviewStatus) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(initiator_tab);
- scoped_refptr<printing::PrintPreviewTabController>
- controller(new printing::PrintPreviewTabController());
+ printing::PrintPreviewTabController* controller =
+ printing::PrintPreviewTabController::GetInstance();
ASSERT_TRUE(controller);
+ initiator_tab->print_view_manager()->PrintPreviewNow();
TabContentsWrapper* preview_tab =
controller->GetOrCreatePreviewTab(initiator_tab);
« no previous file with comments | « chrome/browser/ui/webui/print_preview_handler_unittest.cc ('k') | chrome/common/print_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698