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

printing/printing_context.h

 // Copyright (c) 2011 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.
 
 #ifndef PRINTING_PRINTING_CONTEXT_H_
 #define PRINTING_PRINTING_CONTEXT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "printing/print_settings.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace printing {
 
 // An abstraction of a printer context, implemented by objects that describe the
 // user selected printing context. This includes the OS-dependent UI to ask the
 // user about the print settings. Concrete implementations directly talk to the
 // printer and manage the document and page breaks.
 class PRINTING_EXPORT PrintingContext {
  public:
-  // Printing context delegate.
-  class Delegate {
-   public:
-    Delegate() {};
-    virtual ~Delegate() {};
-
-    // Returns parent view to use for modal dialogs.
-    virtual gfx::NativeView GetParentView() = 0;
-
-    // Returns application locale.
-    virtual std::string GetAppLocale() = 0;
-  };
-
   // Tri-state result for user behavior-dependent functions.
   enum Result {
     OK,
     CANCEL,
     FAILED,
   };
 
   virtual ~PrintingContext();
 
   // Callback of AskUserForSettings, used to notify the PrintJobWorker when
   // print settings are available.
   typedef base::Callback<void(Result)> PrintSettingsCallback;
 
   // Asks the user what printer and format should be used to print. Updates the
   // context with the select device settings. The result of the call is returned
   // in the callback. This is necessary for Linux, which only has an
   // asynchronous printing API.
-  virtual void AskUserForSettings(int max_pages,
+  virtual void AskUserForSettings(gfx::NativeView parent_view,
+                                  int max_pages,
                                   bool has_selection,
                                   const PrintSettingsCallback& callback) = 0;
 
   // Selects the user's default printer and format. Updates the context with the
   // default device settings.
   virtual Result UseDefaultSettings() = 0;
 
   // Updates the context with PDF printer settings.
   Result UsePdfSettings();
 
@@ skipping 34 matching lines @@
   // immediately.
   virtual void Cancel() = 0;
 
   // Releases the native printing context.
   virtual void ReleaseContext() = 0;
 
   // Returns the native context used to print.
   virtual gfx::NativeDrawingContext context() const = 0;
 
   // Creates an instance of this object. Implementers of this interface should
-  // implement this method to create an object of their implementation.
-  static scoped_ptr<PrintingContext> Create(Delegate* delegate);
+  // implement this method to create an object of their implementation. The
+  // caller owns the returned object.
+  static PrintingContext* Create(const std::string& app_locale);
 
   void set_margin_type(MarginType type);
 
   const PrintSettings& settings() const {
     return settings_;
   }
 
  protected:
-  explicit PrintingContext(Delegate* delegate);
+  explicit PrintingContext(const std::string& app_locale);
 
   // Reinitializes the settings for object reuse.
   void ResetSettings();
 
   // Does bookkeeping when an error occurs.
   PrintingContext::Result OnError();
 
   // Complete print context settings.
   PrintSettings settings_;
 
-  // Printing context delegate.
-  Delegate* delegate_;
-
   // The dialog box has been dismissed.
   volatile bool dialog_box_dismissed_;
 
   // Is a print job being done.
   volatile bool in_print_job_;
 
   // Did the user cancel the print job.
   volatile bool abort_printing_;
 
+  // The application locale.
+  std::string app_locale_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(PrintingContext);
 };
 
 }  // namespace printing
 
 #endif  // PRINTING_PRINTING_CONTEXT_H_