Index: ui/base/clipboard/clipboard_android.cc |
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc |
index b33b78fcd7fcadcd517ef93cab653c0056408ee9..a58ae5f6b5a5c599872a6403dd51f1eeb2001546 100644 |
--- a/ui/base/clipboard/clipboard_android.cc |
+++ b/ui/base/clipboard/clipboard_android.cc |
@@ -9,6 +9,7 @@ |
#include "base/android/context_utils.h" |
#include "base/android/jni_string.h" |
#include "base/android/scoped_java_ref.h" |
+#include "base/callback.h" |
#include "base/lazy_instance.h" |
#include "base/stl_util.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -52,6 +53,7 @@ const char kBookmarkFormat[] = "bookmark"; |
class ClipboardMap { |
public: |
ClipboardMap(); |
+ void SetModifiedCallback(ClipboardAndroid::Modified cb); |
std::string Get(const std::string& format); |
uint64_t GetSequenceNumber() const; |
base::Time GetLastModifiedTime() const; |
@@ -62,6 +64,9 @@ class ClipboardMap { |
void CommitToAndroidClipboard(); |
void Clear(); |
+ // Unlike the functions above, does not call |modified_cb_|. |
+ void SetLastModifiedTimeWithoutRunningCallback(base::Time time); |
+ |
private: |
enum class MapState { |
kOutOfDate, |
@@ -69,7 +74,12 @@ class ClipboardMap { |
kPreparingCommit, |
}; |
+ // Updates |last_modified_time_| to |time| and writes it to |local_state_|. |
+ void UpdateLastModifiedTime(base::Time time); |
+ |
+ // 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 +87,8 @@ class ClipboardMap { |
uint64_t sequence_number_; |
base::Time last_modified_time_; |
+ ClipboardAndroid::Modified modified_cb_; |
+ |
// Java class and methods for the Android ClipboardManager. |
ScopedJavaGlobalRef<jobject> clipboard_manager_; |
}; |
@@ -87,6 +99,10 @@ ClipboardMap::ClipboardMap() : map_state_(MapState::kOutOfDate) { |
DCHECK(clipboard_manager_.obj()); |
} |
+void ClipboardMap::SetModifiedCallback(ClipboardAndroid::Modified cb) { |
+ modified_cb_ = std::move(cb); |
dcheng
2017/04/27 15:25:39
Nit: #include <utility>
Mark P
2017/04/27 19:25:59
Done.
|
+} |
+ |
std::string ClipboardMap::Get(const std::string& format) { |
base::AutoLock lock(lock_); |
UpdateFromAndroidClipboard(); |
@@ -103,7 +119,7 @@ base::Time ClipboardMap::GetLastModifiedTime() const { |
} |
void ClipboardMap::ClearLastModifiedTime() { |
- last_modified_time_ = base::Time(); |
+ UpdateLastModifiedTime(base::Time()); |
} |
bool ClipboardMap::HasFormat(const std::string& format) { |
@@ -114,7 +130,7 @@ bool ClipboardMap::HasFormat(const std::string& format) { |
void ClipboardMap::OnPrimaryClipboardChanged() { |
sequence_number_++; |
- last_modified_time_ = base::Time::Now(); |
+ UpdateLastModifiedTime(base::Time::Now()); |
map_state_ = MapState::kOutOfDate; |
} |
@@ -151,7 +167,7 @@ void ClipboardMap::CommitToAndroidClipboard() { |
} |
map_state_ = MapState::kUpToDate; |
sequence_number_++; |
- last_modified_time_ = base::Time::Now(); |
+ UpdateLastModifiedTime(base::Time::Now()); |
} |
void ClipboardMap::Clear() { |
@@ -161,7 +177,11 @@ void ClipboardMap::Clear() { |
Java_Clipboard_clear(env, clipboard_manager_); |
map_state_ = MapState::kUpToDate; |
sequence_number_++; |
- last_modified_time_ = base::Time::Now(); |
+ UpdateLastModifiedTime(base::Time::Now()); |
+} |
+ |
+void ClipboardMap::SetLastModifiedTimeWithoutRunningCallback(base::Time time) { |
+ last_modified_time_ = time; |
} |
// Add a key:jstr pair to map, but only if jstr is not null, and also |
@@ -177,6 +197,13 @@ void AddMapEntry(JNIEnv* env, |
} |
} |
+void ClipboardMap::UpdateLastModifiedTime(base::Time time) { |
+ last_modified_time_ = time; |
+ // |modified_callback_| may be null in tests. |
+ if (modified_cb_) |
+ modified_cb_.Run(time); |
+} |
+ |
void ClipboardMap::UpdateFromAndroidClipboard() { |
DCHECK_NE(MapState::kPreparingCommit, map_state_); |
if (map_state_ == MapState::kUpToDate) |
@@ -303,6 +330,15 @@ void ClipboardAndroid::OnPrimaryClipChanged( |
g_map.Get().OnPrimaryClipboardChanged(); |
} |
+void ClipboardAndroid::SetModifiedCallback(Modified cb) { |
+ g_map.Get().SetModifiedCallback(std::move(cb)); |
+} |
+ |
+void ClipboardAndroid::SetLastModifiedTimeWithoutRunningCallback( |
+ base::Time time) { |
+ g_map.Get().SetLastModifiedTimeWithoutRunningCallback(time); |
+} |
+ |
ClipboardAndroid::ClipboardAndroid() { |
DCHECK(CalledOnValidThread()); |
} |