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

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

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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
===================================================================
--- chrome/browser/printing/print_preview_tab_controller.cc (revision 117871)
+++ chrome/browser/printing/print_preview_tab_controller.cc (working copy)
@@ -260,9 +260,8 @@
for (size_t i = 0; i < closed_preview_tabs.size(); ++i) {
RemovePreviewTab(closed_preview_tabs[i]);
- PrintPreviewUI* print_preview_ui =
- static_cast<PrintPreviewUI*>(
- closed_preview_tabs[i]->web_contents()->GetWebUI());
+ PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
+ closed_preview_tabs[i]->web_contents()->GetWebUI()->GetController());
if (print_preview_ui)
print_preview_ui->OnPrintPreviewTabClosed();
}
@@ -403,8 +402,8 @@
TabContentsWrapper* preview_tab) {
TabContentsWrapper* initiator_tab = GetInitiatorTab(preview_tab);
if (initiator_tab && preview_tab->web_contents()->GetWebUI()) {
- PrintPreviewUI* print_preview_ui =
- static_cast<PrintPreviewUI*>(preview_tab->web_contents()->GetWebUI());
+ PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
+ preview_tab->web_contents()->GetWebUI()->GetController());
print_preview_ui->SetInitiatorTabURLAndTitle(
initiator_tab->web_contents()->GetURL().spec(),
initiator_tab->print_view_manager()->RenderSourceName());
@@ -467,8 +466,8 @@
initiator_tab->print_view_manager()->PrintPreviewDone();
// Initiator tab is closed. Close the print preview tab too.
- PrintPreviewUI* print_preview_ui =
- static_cast<PrintPreviewUI*>(preview_tab->web_contents()->GetWebUI());
+ PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
+ preview_tab->web_contents()->GetWebUI()->GetController());
if (print_preview_ui)
print_preview_ui->OnInitiatorTabClosed();
}
@@ -484,8 +483,8 @@
// Print preview TabContents is destroyed. Notify |PrintPreviewUI| to abort
// the initiator tab preview request.
- PrintPreviewUI* print_preview_ui =
- static_cast<PrintPreviewUI*>(preview_tab->web_contents()->GetWebUI());
+ PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
+ preview_tab->web_contents()->GetWebUI()->GetController());
if (print_preview_ui)
print_preview_ui->OnTabDestroyed();

Powered by Google App Engine
This is Rietveld 408576698