Revert of Added PrintingContext::Delegate to get parent view handle and application locale.

printing/printing_context_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/printing_context_android.h"
 
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 43 matching lines @@
     range.to = *it;
     range_vector.push_back(range);
   }
 }
 
 }  // namespace
 
 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
 void PrintingContextAndroid::PdfWritingDone(int fd, bool success) {
   JNIEnv* env = base::android::AttachCurrentThread();
   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.
 }
 
 PrintingContextAndroid::~PrintingContextAndroid() {
 }
 
 void PrintingContextAndroid::AskUserForSettings(
+    gfx::NativeView parent_view,
     int max_pages,
     bool has_selection,
     const PrintSettingsCallback& callback) {
   // This method is always run in the UI thread.
   callback_ = callback;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   if (j_printing_context_.is_null()) {
     j_printing_context_.Reset(Java_PrintingContext_create(
         env,
@@ skipping 48 matching lines @@
   SetSizes(&settings_, kDefaultPdfDpi, physical_size.width(),
            physical_size.height());
   return OK;
 }
 
 gfx::Size PrintingContextAndroid::GetPdfPaperSizeDeviceUnits() {
   // NOTE: This implementation is the same as in PrintingContextNoSystemDialog.
   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: "
                  << error;
     width = static_cast<int>(
         kLetterWidthInch * settings_.device_units_per_inch());
     height = static_cast<int>(
         kLetterHeightInch  * settings_.device_units_per_inch());
   } else {
     // ulocdata_getPaperSize returns the width and height in mm.
@@ skipping 74 matching lines @@
   // Intentional No-op.
   return NULL;
 }
 
 // static
 bool PrintingContextAndroid::RegisterPrintingContext(JNIEnv* env) {
    return RegisterNativesImpl(env);
 }
 
 }  // namespace printing