Clipboard Android - Store and Read Last Modified Time from Prefs

ui/base/clipboard/clipboard_android.cc

Index: ui/base/clipboard/clipboard_android.cc
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc
index 1761d6c35e97d96558985cdabaf27963fe43b39b..5e5dab9f4ad869174d38efd439abd692194ab382 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -14,6 +14,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
 #include "jni/Clipboard_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
@@ -40,6 +42,10 @@ namespace ui {
 
 namespace {
 
+// Stores the last modified time in Time::Time's internal format (int64) as
+// a pref in local store.  (I.e., this is not a per-profile pref.)
+const char kClipboardLastModifiedTimePref[] = "ui.clipboard.last_modified_time";
+
 // Various formats we support.
 const char kURLFormat[] = "url";
 const char kPlainTextFormat[] = "text";
@@ -52,6 +58,7 @@ const char kBookmarkFormat[] = "bookmark";
 class ClipboardMap {
  public:
   ClipboardMap();
+  void SetLocalState(PrefService* local_state);
   std::string Get(const std::string& format);
   uint64_t GetSequenceNumber() const;
   base::Time GetLastModifiedTime() const;
@@ -69,7 +76,12 @@ class ClipboardMap {
     kPreparingCommit,
   };
 
+  // Writes |last_modified_time_| to |local_state_|.
+  void UpdateLastModifiedTimePref();
+
+  // Updates |map_| and |map_state_| if necessary by fetching data from Java.
   void UpdateFromAndroidClipboard();
+
   std::map<std::string, std::string> map_;
   MapState map_state_;
   base::Lock lock_;
@@ -77,6 +89,8 @@ class ClipboardMap {
   uint64_t sequence_number_;
   base::Time last_modified_time_;
 
+  PrefService* local_state_;
+
   // Java class and methods for the Android ClipboardManager.
   ScopedJavaGlobalRef<jobject> clipboard_manager_;
 };
@@ -87,6 +101,12 @@ ClipboardMap::ClipboardMap() : map_state_(MapState::kOutOfDate) {
   DCHECK(clipboard_manager_.obj());
 }
 
+void ClipboardMap::SetLocalState(PrefService* local_state) {
+  local_state_ = local_state;
+  last_modified_time_ = base::Time::FromInternalValue(
+      local_state_->GetInt64(kClipboardLastModifiedTimePref));
+}
+
 std::string ClipboardMap::Get(const std::string& format) {
   base::AutoLock lock(lock_);
   UpdateFromAndroidClipboard();
@@ -104,6 +124,7 @@ base::Time ClipboardMap::GetLastModifiedTime() const {
 
 void ClipboardMap::ClearLastModifiedTime() {
   last_modified_time_ = base::Time();
+  UpdateLastModifiedTimePref();
 }
 
 bool ClipboardMap::HasFormat(const std::string& format) {
@@ -115,6 +136,7 @@ bool ClipboardMap::HasFormat(const std::string& format) {
 void ClipboardMap::OnPrimaryClipboardChanged() {
   sequence_number_++;
   last_modified_time_ = base::Time::Now();
+  UpdateLastModifiedTimePref();
   map_state_ = MapState::kOutOfDate;
 }
 
@@ -152,6 +174,7 @@ void ClipboardMap::CommitToAndroidClipboard() {
   map_state_ = MapState::kUpToDate;
   sequence_number_++;
   last_modified_time_ = base::Time::Now();
+  UpdateLastModifiedTimePref();
 }
 
 void ClipboardMap::Clear() {
@@ -162,6 +185,7 @@ void ClipboardMap::Clear() {
   map_state_ = MapState::kUpToDate;
   sequence_number_++;
   last_modified_time_ = base::Time::Now();
+  UpdateLastModifiedTimePref();

[Ted C, 2017/04/24 20:45:48]

should we make UpdateLastModifiedTimePref take the time and set
last_modified_time_ internally?

[Mark P, 2017/04/24 22:19:56]

Makes sense to me.  Done.

 }
 
 // Add a key:jstr pair to map, but only if jstr is not null, and also
@@ -177,6 +201,14 @@ void AddMapEntry(JNIEnv* env,
   }
 }
 
+void ClipboardMap::UpdateLastModifiedTimePref() {
+  // |local_state_| may be null in tests.
+  if (local_state_) {
+    local_state_->SetInt64(kClipboardLastModifiedTimePref,
+                           last_modified_time_.ToInternalValue());
+  }
+}
+
 void ClipboardMap::UpdateFromAndroidClipboard() {
   DCHECK_NE(MapState::kPreparingCommit, map_state_);
   if (map_state_ == MapState::kUpToDate)
@@ -297,6 +329,15 @@ Clipboard* Clipboard::Create() {
 
 // ClipboardAndroid implementation.
 
+// static
+void ClipboardAndroid::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterInt64Pref(kClipboardLastModifiedTimePref, 0u);
+}
+
+void ClipboardAndroid::SetLocalState(PrefService* local_state) {
+  g_map.Get().SetLocalState(local_state);
+}
+
 void ClipboardAndroid::OnPrimaryClipChanged(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj) {