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

Unified Diff: printing/printing_context_linux.cc

Issue 504763002: Revert of Added PrintingContext::Delegate to get parent view handle and application locale. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « printing/printing_context_linux.h ('k') | printing/printing_context_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing_context_linux.cc
diff --git a/printing/printing_context_linux.cc b/printing/printing_context_linux.cc
index c267478e764238f6524c43310defd33fc1c3991a..3b6d2ee9f1faca5339aa168d2c6110e8972c1517 100644
--- a/printing/printing_context_linux.cc
+++ b/printing/printing_context_linux.cc
@@ -27,12 +27,13 @@
namespace printing {
// static
-scoped_ptr<PrintingContext> PrintingContext::Create(Delegate* delegate) {
- return make_scoped_ptr<PrintingContext>(new PrintingContextLinux(delegate));
+PrintingContext* PrintingContext::Create(const std::string& app_locale) {
+ return static_cast<PrintingContext*>(new PrintingContextLinux(app_locale));
}
-PrintingContextLinux::PrintingContextLinux(Delegate* delegate)
- : PrintingContext(delegate), print_dialog_(NULL) {
+PrintingContextLinux::PrintingContextLinux(const std::string& app_locale)
+ : PrintingContext(app_locale),
+ print_dialog_(NULL) {
}
PrintingContextLinux::~PrintingContextLinux() {
@@ -66,6 +67,7 @@
}
void PrintingContextLinux::AskUserForSettings(
+ gfx::NativeView parent_view,
int max_pages,
bool has_selection,
const PrintSettingsCallback& callback) {
@@ -77,8 +79,7 @@
return;
}
- print_dialog_->ShowDialog(
- delegate_->GetParentView(), has_selection, callback);
+ print_dialog_->ShowDialog(parent_view, has_selection, callback);
}
PrintingContext::Result PrintingContextLinux::UseDefaultSettings() {
« no previous file with comments | « printing/printing_context_linux.h ('k') | printing/printing_context_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698