summaryrefslogtreecommitdiffstats
path: root/ui/oak
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 01:12:28 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 01:12:28 +0000
commitfc72e7f7f5d5ef9dd5bffe5fdabd5caf4e269321 (patch)
tree41e79a906fa536ae029e4e212c3af8e2a2c4aacd /ui/oak
parentb6a25105cd5a036da7a652598b1331ff685d027a (diff)
downloadchromium_src-fc72e7f7f5d5ef9dd5bffe5fdabd5caf4e269321.zip
chromium_src-fc72e7f7f5d5ef9dd5bffe5fdabd5caf4e269321.tar.gz
chromium_src-fc72e7f7f5d5ef9dd5bffe5fdabd5caf4e269321.tar.bz2
Ash/aura split: NativeWidgetAura::GetWindowScreenBounds() should return screen bounds.
- Renames aura::Window::GetScreenBounds() to ::GetBoundsInRootWindow(), which is what it really does. - NativeWidgetAura now gives its NativeWidgetHelperAura a chance to modify those bounds. BUG=none TEST=none Review URL: http://codereview.chromium.org/10210005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/oak')
-rw-r--r--ui/oak/oak_aura_window_display.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/oak/oak_aura_window_display.cc b/ui/oak/oak_aura_window_display.cc
index a6e0fbe0..68130091 100644
--- a/ui/oak/oak_aura_window_display.cc
+++ b/ui/oak/oak_aura_window_display.cc
@@ -25,7 +25,7 @@ ROW_TRANSPARENT,
ROW_LAYER,
ROW_VISIBLE,
ROW_BOUNDS,
-ROW_SCREENBOUNDS,
+ROW_BOUNDSINROOTWINDOW,
ROW_TRANSFORM,
ROW_PARENT,
ROW_ROOTWINDOW,
@@ -121,8 +121,9 @@ string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
return PropertyWithBool("Visible: ", window_->IsVisible());
case ROW_BOUNDS:
return PropertyWithBounds("Bounds: ", window_->bounds());
- case ROW_SCREENBOUNDS:
- return PropertyWithBounds("Screen Bounds: ", window_->GetScreenBounds());
+ case ROW_BOUNDSINROOTWINDOW:
+ return PropertyWithBounds("Bounds in Root Window: ",
+ window_->GetBoundsInRootWindow());
case ROW_TRANSFORM:
return ASCIIToUTF16("Transform:");
case ROW_PARENT: