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

Unified Diff: printing/printing_context_android.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_android.h ('k') | printing/printing_context_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing_context_android.cc
diff --git a/printing/printing_context_android.cc b/printing/printing_context_android.cc
index 39f1c6dc5549af0f89250d2322e215a4c015332c..5729267f320a13cb7061e118fc1cad7aac534d8c 100644
--- a/printing/printing_context_android.cc
+++ b/printing/printing_context_android.cc
@@ -61,8 +61,8 @@
namespace printing {
// static
-scoped_ptr<PrintingContext> PrintingContext::Create(Delegate* delegate) {
- return make_scoped_ptr<PrintingContext>(new PrintingContextAndroid(delegate));
+PrintingContext* PrintingContext::Create(const std::string& app_locale) {
+ return new PrintingContextAndroid(app_locale);
}
// static
@@ -71,8 +71,8 @@
Java_PrintingContext_pdfWritingDone(env, fd, success);
}
-PrintingContextAndroid::PrintingContextAndroid(Delegate* delegate)
- : PrintingContext(delegate) {
+PrintingContextAndroid::PrintingContextAndroid(const std::string& app_locale)
+ : PrintingContext(app_locale) {
// The constructor is run in the IO thread.
}
@@ -80,6 +80,7 @@
}
void PrintingContextAndroid::AskUserForSettings(
+ gfx::NativeView parent_view,
int max_pages,
bool has_selection,
const PrintSettingsCallback& callback) {
@@ -148,8 +149,7 @@
int32_t width = 0;
int32_t height = 0;
UErrorCode error = U_ZERO_ERROR;
- ulocdata_getPaperSize(
- delegate_->GetAppLocale().c_str(), &height, &width, &error);
+ ulocdata_getPaperSize(app_locale_.c_str(), &height, &width, &error);
if (error > U_ZERO_ERROR) {
// If the call failed, assume a paper size of 8.5 x 11 inches.
LOG(WARNING) << "ulocdata_getPaperSize failed, using 8.5 x 11, error: "
« no previous file with comments | « printing/printing_context_android.h ('k') | printing/printing_context_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698