diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 00:01:43 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 00:01:43 +0000 |
| commit | 26934aecea06513fc5e826578646c33fc37d1839 (patch) | |
| tree | 06d477512da86835c383d14e013354013fca323c /ui/aura/window.cc | |
| parent | d74b1b199c0708aa2df99b9a4a2e39e672c0de55 (diff) | |
| download | chromium_src-26934aecea06513fc5e826578646c33fc37d1839.zip chromium_src-26934aecea06513fc5e826578646c33fc37d1839.tar.gz chromium_src-26934aecea06513fc5e826578646c33fc37d1839.tar.bz2 | |
Replace RootWindow::GetInstance() usage in a bunch of tests with a new root_window() accessor exposed on AuraTestBase.
Also fixes one place in window.cc to use GetRootWindow() rather than RootWindow::GetInstance().
http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9421009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.cc')
| -rw-r--r-- | ui/aura/window.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/aura/window.cc b/ui/aura/window.cc index b95ddcb..868d329 100644 --- a/ui/aura/window.cc +++ b/ui/aura/window.cc @@ -173,9 +173,7 @@ bool Window::IsVisible() const { gfx::Rect Window::GetScreenBounds() const { gfx::Point origin = bounds().origin(); - Window::ConvertPointToWindow(parent_, - aura::RootWindow::GetInstance(), - &origin); + Window::ConvertPointToWindow(parent_, GetRootWindow(), &origin); return gfx::Rect(origin, bounds().size()); } |