Ash/aura split: NativeWidgetAura::GetWindowScreenBounds() should return screen bounds.

ui/oak/oak_aura_window_display.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/oak/oak_aura_window_display.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/oak/oak_pretty_print.h"
 
 namespace oak {
 namespace internal {
 namespace {
 enum {
 ROW_ID = 0,
 ROW_DELEGATE,
 ROW_TYPE,
 ROW_NAME,
 ROW_TITLE,
 ROW_TRANSPARENT,
 ROW_LAYER,
 ROW_VISIBLE,
 ROW_BOUNDS,
-ROW_SCREENBOUNDS,
+ROW_BOUNDSINROOTWINDOW,
 ROW_TRANSFORM,
 ROW_PARENT,
 ROW_ROOTWINDOW,
 ROW_TRANSIENTCHILDREN,
 ROW_TRANSIENTPARENT,
 ROW_USERDATA,
 ROW_IGNOREEVENTS,
 ROW_CANFOCUS,
 ROW_HITTESTBOUNDSOVERRIDEOUTER,
 ROW_HITTESTBOUNDSOVERRIDEINNER,
@@ skipping 75 matching lines @@
     case ROW_TITLE:
       return ASCIIToUTF16("Title: ") + window_->title();
     case ROW_TRANSPARENT:
       return PropertyWithBool("Transparent: ", window_->transparent());
     case ROW_LAYER:
       return PropertyWithVoidStar("Layer: ", window_->layer());
     case ROW_VISIBLE:
       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:
       return PropertyWithVoidStar("Parent: ", window_->parent());
     case ROW_ROOTWINDOW:
       return PropertyWithVoidStar("Root Window: ", window_->GetRootWindow());
     case ROW_TRANSIENTCHILDREN:
       return PropertyWithInteger("Transient Children: ",
                                  window_->transient_children().size());
     case ROW_TRANSIENTPARENT:
@@ skipping 18 matching lines @@
   }
   return EmptyString16();
 }
 
 void OakAuraWindowDisplay::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
 }  // namespace internal
 }  // namespace oak