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

Unified Diff: ui/aura/window_tree_host.h

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move CTM update code into a separate file ash/touch/touch_ctm_controller.cc Created 6 years, 9 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
Index: ui/aura/window_tree_host.h
diff --git a/ui/aura/window_tree_host.h b/ui/aura/window_tree_host.h
index 39864531c6dcfea22900af285afdd5e56c0eac5c..01742ee7b208d93487e85461902a107f0456270e 100644
--- a/ui/aura/window_tree_host.h
+++ b/ui/aura/window_tree_host.h
@@ -114,6 +114,15 @@ class AURA_EXPORT WindowTreeHost {
gfx::NativeCursor last_cursor() const { return last_cursor_; }
+ void UpdateDisplayID(int64 id1, int64 id2) {
+ display_ids_.first = id1;
+ display_ids_.second = id2;
+ }
+
+ const std::pair<int64, int64>& display_ids() const {
+ return display_ids_;
+ }
+
// Returns the accelerated widget.
virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
@@ -218,6 +227,13 @@ class AURA_EXPORT WindowTreeHost {
scoped_ptr<ui::ViewProp> prop_;
+ // The display IDs associated with this root window.
+ // In single monitor or extended mode dual monitor case, the root window
+ // is associated with one display.
+ // In mirror mode dual monitors case, the root window is associated with
+ // both displays.
+ std::pair<int64, int64> display_ids_;
oshima 2014/03/14 21:53:53 Instead of adding these information and code in th
Ben Goodger (Google) 2014/03/24 19:36:55 And if this code is only used from ash, some code
oshima 2014/03/24 20:00:10 Sorry I probably wasn't clear. This is used from a
+
DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
};

Powered by Google App Engine
This is Rietveld 408576698