| Index: ui/base/clipboard/clipboard_android.h
|
| diff --git a/ui/base/clipboard/clipboard_android.h b/ui/base/clipboard/clipboard_android.h
|
| index a41550a24819d234ab4aa5b38eab136ccd0fc401..8589e9c75587b2936c5ae3c27c9b2dd40b0e7cf7 100644
|
| --- a/ui/base/clipboard/clipboard_android.h
|
| +++ b/ui/base/clipboard/clipboard_android.h
|
| @@ -11,11 +11,19 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include "base/android/scoped_java_ref.h"
|
| #include "base/macros.h"
|
| +#include "base/time/time.h"
|
|
|
| namespace ui {
|
|
|
| class ClipboardAndroid : public Clipboard {
|
| + public:
|
| + // Called by Java when the Java Clipboard is notified that the clipboard has
|
| + // changed.
|
| + void OnPrimaryClipChanged(JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& obj);
|
| +
|
| private:
|
| friend class Clipboard;
|
|
|
| @@ -45,7 +53,8 @@ class ClipboardAndroid : public Clipboard {
|
| base::string16* result) const override;
|
| void ReadBookmark(base::string16* title, std::string* url) const override;
|
| void ReadData(const FormatType& format, std::string* result) const override;
|
| - base::Time GetClipboardLastModifiedTime() const override;
|
| + base::Time GetLastModifiedTime() const override;
|
| + void ClearLastModifiedTime() override;
|
| void WriteObjects(ClipboardType type, const ObjectMap& objects) override;
|
| void WriteText(const char* text_data, size_t text_len) override;
|
| void WriteHTML(const char* markup_data,
|
| @@ -66,6 +75,9 @@ class ClipboardAndroid : public Clipboard {
|
| DISALLOW_COPY_AND_ASSIGN(ClipboardAndroid);
|
| };
|
|
|
| +// Registers the ClipboardAndroid native method.
|
| +bool RegisterClipboardAndroid(JNIEnv* env);
|
| +
|
| } // namespace ui
|
|
|
| #endif // UI_BASE_CLIPBOARD_CLIPBOARD_ANDROID_H_
|
|
|