| Index: content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
|
| diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
|
| index 496070909f82a7c6bd943cbf6107da1b8fac6c3a..de5f5fec949025bb431c6533e9793172f106e8e7 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
|
| +++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
|
| @@ -5,8 +5,6 @@
|
| #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h"
|
|
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/content_browser_client.h"
|
| -#include "content/public/common/content_client.h"
|
| #include "ppapi/c/pp_errors.h"
|
| #include "printing/printing_context.h"
|
| #include "printing/units.h"
|
| @@ -44,23 +42,12 @@
|
| return result;
|
| }
|
|
|
| -class PrintingContextDelegate : public printing::PrintingContext::Delegate {
|
| - public:
|
| - // PrintingContext::Delegate methods.
|
| - virtual gfx::NativeView GetParentView() OVERRIDE { return NULL; }
|
| - virtual std::string GetAppLocale() OVERRIDE {
|
| - return GetContentClient()->browser()->GetApplicationLocale();
|
| - }
|
| -};
|
| -
|
| PepperPrintSettingsManager::Result ComputeDefaultPrintSettings() {
|
| // This function should run on the UI thread because |PrintingContext| methods
|
| // call into platform APIs.
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| -
|
| - PrintingContextDelegate delegate;
|
| scoped_ptr<printing::PrintingContext> context(
|
| - printing::PrintingContext::Create(&delegate));
|
| + printing::PrintingContext::Create(std::string()));
|
| if (!context.get() ||
|
| context->UseDefaultSettings() != printing::PrintingContext::OK) {
|
| return PepperPrintSettingsManager::Result(PP_PrintSettings_Dev(),
|
|
|