Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Unified Diff: ui/base/x/selection_owner.cc

Issue 2287583003: Linux: Remove --wm-user-time-ms command line argument (Closed)
Patch Set: Deprecate histogram Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/metrics/histograms/histograms.xml ('k') | ui/events/platform/x11/x11_event_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/x/selection_owner.cc
diff --git a/ui/base/x/selection_owner.cc b/ui/base/x/selection_owner.cc
index e6651f0b814dec70abddccff23f808c41171a0c0..af58a3787a58d8548386e4219cee3f83bc5069f5 100644
--- a/ui/base/x/selection_owner.cc
+++ b/ui/base/x/selection_owner.cc
@@ -118,13 +118,9 @@ void SelectionOwner::RetrieveTargets(std::vector<XAtom>* targets) {
void SelectionOwner::TakeOwnershipOfSelection(
const SelectionFormatMap& data) {
- // Save the last server timestamp seen from X, to satisfy requests for the
- // TIMESTAMP target later…
- acquired_selection_timestamp_ =
- X11EventSource::GetInstance()->last_seen_server_time();
- // …but always pass CurrentTime to XSetSelectionOwner to increase the chances
- // of this succeeding.
- XSetSelectionOwner(x_display_, selection_name_, x_window_, CurrentTime);
+ acquired_selection_timestamp_ = X11EventSource::GetInstance()->GetTimestamp();
+ XSetSelectionOwner(x_display_, selection_name_, x_window_,
+ acquired_selection_timestamp_);
if (XGetSelectionOwner(x_display_, selection_name_) == x_window_) {
// The X server agrees that we are the selection owner. Commit our data.
« no previous file with comments | « tools/metrics/histograms/histograms.xml ('k') | ui/events/platform/x11/x11_event_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698