| Index: printing/printing_context_android.h
|
| diff --git a/printing/printing_context_no_system_dialog.h b/printing/printing_context_android.h
|
| similarity index 62%
|
| copy from printing/printing_context_no_system_dialog.h
|
| copy to printing/printing_context_android.h
|
| index b88578ba5269a3b9132757a64ef823e9f7ae4691..3a2e4b2fa65daab1d19300901006cd3edd3540d5 100644
|
| --- a/printing/printing_context_no_system_dialog.h
|
| +++ b/printing/printing_context_android.h
|
| @@ -1,24 +1,23 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| -#ifndef PRINTING_PRINTING_CONTEXT_NO_SYSTEM_DIALOG_H_
|
| -#define PRINTING_PRINTING_CONTEXT_NO_SYSTEM_DIALOG_H_
|
| +#ifndef PRINTING_PRINTING_CONTEXT_ANDROID_H_
|
| +#define PRINTING_PRINTING_CONTEXT_ANDROID_H_
|
| +
|
| +#include <jni.h>
|
|
|
| #include <string>
|
|
|
| +#include "base/android/scoped_java_ref.h"
|
| #include "printing/printing_context.h"
|
|
|
| -namespace base {
|
| -class DictionaryValue;
|
| -}
|
| -
|
| namespace printing {
|
|
|
| -class PRINTING_EXPORT PrintingContextNoSystemDialog : public PrintingContext {
|
| +class PRINTING_EXPORT PrintingContextAndroid : public PrintingContext {
|
| public:
|
| - explicit PrintingContextNoSystemDialog(const std::string& app_locale);
|
| - virtual ~PrintingContextNoSystemDialog();
|
| + explicit PrintingContextAndroid(const std::string& app_locale);
|
| + virtual ~PrintingContextAndroid();
|
|
|
| // PrintingContext implementation.
|
| virtual void AskUserForSettings(
|
| @@ -39,10 +38,15 @@ class PRINTING_EXPORT PrintingContextNoSystemDialog : public PrintingContext {
|
| virtual void ReleaseContext() OVERRIDE;
|
| virtual gfx::NativeDrawingContext context() const OVERRIDE;
|
|
|
| + static bool RegisterPrintingContext(JNIEnv* env);
|
| +
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(PrintingContextNoSystemDialog);
|
| + base::android::ScopedJavaGlobalRef<jobject> j_printing_context_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(PrintingContextAndroid);
|
| };
|
|
|
| } // namespace printing
|
|
|
| -#endif // PRINTING_PRINTING_CONTEXT_NO_SYSTEM_DIALOG_H_
|
| +#endif // PRINTING_PRINTING_CONTEXT_ANDROID_H_
|
| +
|
|
|