chrome/browser/printing/print_preview_message_handler.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/printing/print_preview_message_handler.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

« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/printing/print_preview_tab_controller.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/printing/print_preview_message_handler.cc

===================================================================

--- chrome/browser/printing/print_preview_message_handler.cc (revision 117871)

+++ chrome/browser/printing/print_preview_message_handler.cc (working copy)

@@ -19,6 +19,7 @@

#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"

#include "chrome/common/print_messages.h"

#include "content/browser/renderer_host/render_view_host.h"

+#include "content/browser/webui/web_ui.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/web_contents.h"

#include "printing/page_size_margins.h"

@@ -97,7 +98,7 @@

return NULL;

return static_cast<PrintPreviewUI*>(

- print_preview_tab->web_contents()->GetWebUI());

+ print_preview_tab->web_contents()->GetWebUI()->GetController());

}

void PrintPreviewMessageHandler::OnRequestPrintPreview(

@@ -119,7 +120,7 @@

return;

PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(

- print_preview_tab->web_contents()->GetWebUI());

+ print_preview_tab->web_contents()->GetWebUI()->GetController());

if (!params.is_modifiable || params.clear_preview_data)

print_preview_ui->ClearAllPreviewData();

@@ -134,7 +135,7 @@

return;

PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(

- print_preview_tab->web_contents()->GetWebUI());

+ print_preview_tab->web_contents()->GetWebUI()->GetController());

int page_number = params.page_number;

if (page_number >= FIRST_PAGE_INDEX && params.data_size) {

RefCountedBytes* data_bytes =

@@ -163,7 +164,7 @@

return;

PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(

- print_preview_tab->web_contents()->GetWebUI());

+ print_preview_tab->web_contents()->GetWebUI()->GetController());

if (params.reuse_existing_data) {

// Need to match normal rendering where we are expected to send this.

@@ -206,7 +207,7 @@

return;

PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(

- print_preview_tab->web_contents()->GetWebUI());

+ print_preview_tab->web_contents()->GetWebUI()->GetController());

print_preview_ui->OnDidGetDefaultPageLayout(page_layout_in_points,

has_custom_page_size_style);

}