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

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

Issue 10911351: Switch PrintViewManager, PrintPreviewMessageHandler to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix typo Created 8 years, 3 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_tab_controller.cc
diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc
index 4526b168700bd3b4918099269875ea5ab7629e67..62ee0e64869d63a13a3806aa9087fa6dde61bedc 100644
--- a/chrome/browser/printing/print_preview_tab_controller.cc
+++ b/chrome/browser/printing/print_preview_tab_controller.cc
@@ -229,8 +229,10 @@ void PrintPreviewTabController::PrintPreview(TabContents* tab) {
PrintPreviewTabController* tab_controller = GetInstance();
if (!tab_controller)
return;
- if (!tab_controller->GetOrCreatePreviewTab(tab))
- tab->print_view_manager()->PrintPreviewDone();
+ if (!tab_controller->GetOrCreatePreviewTab(tab)) {
+ printing::PrintViewManager::FromWebContents(tab->web_contents())->
+ PrintPreviewDone();
+ }
}
TabContents* PrintPreviewTabController::GetOrCreatePreviewTab(
@@ -452,7 +454,8 @@ void PrintPreviewTabController::SetInitiatorTabURLAndTitle(
preview_tab->web_contents()->GetWebUI()->GetController());
print_preview_ui->SetInitiatorTabURLAndTitle(
initiator_tab->web_contents()->GetURL().spec(),
- initiator_tab->print_view_manager()->RenderSourceName());
+ printing::PrintViewManager::FromWebContents(
+ initiator_tab->web_contents())->RenderSourceName());
}
}
@@ -501,7 +504,8 @@ void PrintPreviewTabController::RemoveInitiatorTab(TabContents* initiator_tab) {
preview_tab_map_[preview_tab] = NULL;
RemoveObservers(initiator_tab);
- initiator_tab->print_view_manager()->PrintPreviewDone();
+ printing::PrintViewManager::FromWebContents(initiator_tab->web_contents())->
+ PrintPreviewDone();
// Initiator tab is closed. Close the print preview tab too.
PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
@@ -515,7 +519,8 @@ void PrintPreviewTabController::RemovePreviewTab(TabContents* preview_tab) {
TabContents* initiator_tab = GetInitiatorTab(preview_tab);
if (initiator_tab) {
RemoveObservers(initiator_tab);
- initiator_tab->print_view_manager()->PrintPreviewDone();
+ printing::PrintViewManager::FromWebContents(initiator_tab->web_contents())->
+ PrintPreviewDone();
}
// Print preview WebContents is destroyed. Notify |PrintPreviewUI| to abort

Powered by Google App Engine
This is Rietveld 408576698