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

Unified Diff: chrome/renderer/print_web_view_helper.cc

Issue 293001: Delete glue/webview{_delegate}.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/renderer/print_web_view_helper.h ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/print_web_view_helper.cc
===================================================================
--- chrome/renderer/print_web_view_helper.cc (revision 29380)
+++ chrome/renderer/print_web_view_helper.cc (working copy)
@@ -23,6 +23,7 @@
using WebKit::WebScreenInfo;
using WebKit::WebString;
using WebKit::WebURLRequest;
+using WebKit::WebView;
PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint(
const ViewMsg_Print_Params& print_params,
@@ -63,13 +64,14 @@
PrintWebViewHelper::PrintWebViewHelper(RenderView* render_view)
: render_view_(render_view),
+ print_web_view_(NULL),
user_cancelled_scripted_print_count_(0) {}
PrintWebViewHelper::~PrintWebViewHelper() {}
void PrintWebViewHelper::DidFinishPrinting(bool success) {
if (!success) {
- WebView* web_view = print_web_view_.get();
+ WebView* web_view = print_web_view_;
if (!web_view)
web_view = render_view_->webview();
@@ -80,9 +82,9 @@
l10n_util::GetString(IDS_PRINT_SPOOL_FAILED_ERROR_TEXT)));
}
- if (print_web_view_.get()) {
+ if (print_web_view_) {
print_web_view_->close();
- print_web_view_.release(); // Close deletes object.
+ print_web_view_ = NULL;
print_pages_params_.reset();
}
}
@@ -96,8 +98,8 @@
prefs.javascript_enabled = false;
prefs.java_enabled = false;
- print_web_view_.reset(WebView::Create(this));
- prefs.Apply(print_web_view_.get());
+ print_web_view_ = WebView::create(this);
+ prefs.Apply(print_web_view_);
print_web_view_->initializeMainFrame(NULL);
print_pages_params_.reset(new ViewMsg_PrintPages_Params(params));
« no previous file with comments | « chrome/renderer/print_web_view_helper.h ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698