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

Unified Diff: chrome/browser/printing/print_preview_message_handler.cc

Issue 7790020: Cleanup: Convert PrintPreviewTabController to use TabContentsWrapper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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/printing/print_preview_message_handler.cc
===================================================================
--- chrome/browser/printing/print_preview_message_handler.cc (revision 98744)
+++ chrome/browser/printing/print_preview_message_handler.cc (working copy)
@@ -69,17 +69,21 @@
PrintPreviewMessageHandler::~PrintPreviewMessageHandler() {
}
-TabContents* PrintPreviewMessageHandler::GetPrintPreviewTab() {
- printing::PrintPreviewTabController* tab_controller =
- printing::PrintPreviewTabController::GetInstance();
+TabContentsWrapper* PrintPreviewMessageHandler::GetPrintPreviewTab() {
+ PrintPreviewTabController* tab_controller =
+ PrintPreviewTabController::GetInstance();
if (!tab_controller)
return NULL;
- return tab_controller->GetPrintPreviewForTab(tab_contents());
+ return tab_controller->GetPrintPreviewForTab(tab_contents_wrapper());
}
+TabContentsWrapper* PrintPreviewMessageHandler::tab_contents_wrapper() {
+ return TabContentsWrapper::GetCurrentWrapperForContents(tab_contents());
+}
+
void PrintPreviewMessageHandler::OnRequestPrintPreview() {
- PrintPreviewTabController::PrintPreview(tab_contents());
+ PrintPreviewTabController::PrintPreview(tab_contents_wrapper());
}
void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(
@@ -89,7 +93,7 @@
return;
}
- TabContents* print_preview_tab = GetPrintPreviewTab();
+ TabContentsWrapper* print_preview_tab = GetPrintPreviewTab();
if (!print_preview_tab || !print_preview_tab->web_ui())
return;
@@ -100,7 +104,7 @@
void PrintPreviewMessageHandler::OnDidPreviewPage(
const PrintHostMsg_DidPreviewPage_Params& params) {
- TabContents* print_preview_tab = GetPrintPreviewTab();
+ TabContentsWrapper* print_preview_tab = GetPrintPreviewTab();
if (!print_preview_tab || !print_preview_tab->web_ui())
return;
@@ -132,17 +136,14 @@
}
// Get the print preview tab.
- TabContents* print_preview_tab = GetPrintPreviewTab();
+ TabContentsWrapper* print_preview_tab = GetPrintPreviewTab();
// User might have closed it already.
- if (!print_preview_tab)
+ if (!print_preview_tab || !print_preview_tab->web_ui())
return;
PrintPreviewUI* print_preview_ui =
static_cast<PrintPreviewUI*>(print_preview_tab->web_ui());
- TabContentsWrapper* wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(print_preview_tab);
-
if (params.reuse_existing_data) {
// Need to match normal rendering where we are expected to send this.
PrintHostMsg_DidGetPreviewPageCount_Params temp_params;
@@ -155,7 +156,7 @@
return;
}
- wrapper->print_view_manager()->OverrideTitle(tab_contents());
+ print_preview_tab->print_view_manager()->OverrideTitle(tab_contents());
// TODO(joth): This seems like a good match for using RefCountedStaticMemory
// to avoid the memory copy, but the SetPrintPreviewData call chain below
@@ -176,18 +177,15 @@
StopWorker(document_cookie);
// Inform the print preview tab of the failure.
- TabContents* print_preview_tab = GetPrintPreviewTab();
+ TabContentsWrapper* print_preview_tab = GetPrintPreviewTab();
// User might have closed it already.
- if (!print_preview_tab)
+ if (!print_preview_tab || !print_preview_tab->web_ui())
return;
- TabContentsWrapper* wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(print_preview_tab);
-
if (g_browser_process->background_printing_manager()->
- HasTabContents(wrapper)) {
+ HasTabContents(print_preview_tab)) {
// Preview tab was hidden to serve the print request.
- delete wrapper;
+ delete print_preview_tab;
} else {
PrintPreviewUI* print_preview_ui =
static_cast<PrintPreviewUI*>(print_preview_tab->web_ui());
@@ -197,8 +195,8 @@
void PrintPreviewMessageHandler::OnDidGetDefaultPageLayout(
const PageSizeMargins& page_layout_in_points) {
- TabContents* print_preview_tab = GetPrintPreviewTab();
- if (!print_preview_tab)
+ TabContentsWrapper* print_preview_tab = GetPrintPreviewTab();
+ if (!print_preview_tab || !print_preview_tab->web_ui())
return;
PrintPreviewUI* print_preview_ui =
@@ -236,7 +234,7 @@
void PrintPreviewMessageHandler::DidStartLoading() {
if (tab_contents()->delegate() &&
- printing::PrintPreviewTabController::IsPrintPreviewTab(tab_contents())) {
+ PrintPreviewTabController::IsPrintPreviewTab(tab_contents_wrapper())) {
tab_contents()->SetContentRestrictions(CONTENT_RESTRICTION_PRINT);
}
}

Powered by Google App Engine
This is Rietveld 408576698