summaryrefslogtreecommitdiffstats
path: root/ui/aura/desktop
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-23 01:10:24 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-23 01:10:24 +0000
commit20c59762011349aa849b74104b864d320a8d0685 (patch)
tree0872df9f8dec79620fa7a4f1b9540a300fb2c70a /ui/aura/desktop
parente4ddff22e2d04a616a65cd8c6b963d3b02470aba (diff)
downloadchromium_src-20c59762011349aa849b74104b864d320a8d0685.zip
chromium_src-20c59762011349aa849b74104b864d320a8d0685.tar.gz
chromium_src-20c59762011349aa849b74104b864d320a8d0685.tar.bz2
This is the 1st CL to add Virtual Screen Coordinates to ash.
- Add flag to enable virtual screen coordinate system - Changed StackingController to use the bounds to pick the matching root window when the virtual screen coordinates is enabled. - Added Shell::GetRootWindowMatching. Updated Shell::GetRootWindowAt to use VSC when enabled. BUG=123160 TEST=ExtendedDesktopTest.CycleWindow is changed to use virtual screen coordinate. ExtendedDesktopTest.{GetRootRootAt|GetRootWindowMatching) Review URL: https://chromiumcodereview.appspot.com/10637007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/desktop')
-rw-r--r--ui/aura/desktop/desktop_stacking_client.cc3
-rw-r--r--ui/aura/desktop/desktop_stacking_client.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/ui/aura/desktop/desktop_stacking_client.cc b/ui/aura/desktop/desktop_stacking_client.cc
index be705b6..76a6ac0 100644
--- a/ui/aura/desktop/desktop_stacking_client.cc
+++ b/ui/aura/desktop/desktop_stacking_client.cc
@@ -19,7 +19,8 @@ DesktopStackingClient::~DesktopStackingClient() {
aura::client::SetStackingClient(NULL);
}
-Window* DesktopStackingClient::GetDefaultParent(Window* window) {
+Window* DesktopStackingClient::GetDefaultParent(Window* window,
+ const gfx::Rect& bounds) {
if (!null_parent_.get()) {
null_parent_.reset(new aura::RootWindow(gfx::Rect(100, 100)));
null_parent_->Init();
diff --git a/ui/aura/desktop/desktop_stacking_client.h b/ui/aura/desktop/desktop_stacking_client.h
index b9a733e..9baaab8 100644
--- a/ui/aura/desktop/desktop_stacking_client.h
+++ b/ui/aura/desktop/desktop_stacking_client.h
@@ -28,7 +28,8 @@ class AURA_EXPORT DesktopStackingClient : public client::StackingClient {
virtual ~DesktopStackingClient();
// Overridden from client::StackingClient:
- virtual Window* GetDefaultParent(Window* window) OVERRIDE;
+ virtual Window* GetDefaultParent(Window* window,
+ const gfx::Rect& bounds) OVERRIDE;
private:
// Windows with NULL parents are parented to this.