diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 21:20:24 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 21:20:24 +0000 |
| commit | 114bfbd4a938d728e2d7f3c1f403afbee56022b4 (patch) | |
| tree | 2f705cc5fe5e8cc197951aea14344a8224a9ace9 /chrome | |
| parent | 9c68d427e2adc6717cb95a3291b95eff1e877c98 (diff) | |
| download | chromium_src-114bfbd4a938d728e2d7f3c1f403afbee56022b4.zip chromium_src-114bfbd4a938d728e2d7f3c1f403afbee56022b4.tar.gz chromium_src-114bfbd4a938d728e2d7f3c1f403afbee56022b4.tar.bz2 | |
aura: Merge RootWindow into Desktop.
Notable changes:
. Window::GetRoot gets renamed to Window::GetDesktop.
. Desktop::Show gets renamed to Desktop::ShowDesktop, to disambiguate with
Window::Show.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8346009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/fullscreen_aura.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/window_sizer_aura.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/fullscreen_aura.cc b/chrome/browser/fullscreen_aura.cc index c6f6abd..a8938d5 100644 --- a/chrome/browser/fullscreen_aura.cc +++ b/chrome/browser/fullscreen_aura.cc @@ -9,5 +9,5 @@ #include "ui/aura/window.h" bool IsFullScreenMode() { - return aura::Desktop::GetInstance()->window()->IsOrContainsFullscreenWindow(); + return aura::Desktop::GetInstance()->IsOrContainsFullscreenWindow(); } diff --git a/chrome/browser/ui/window_sizer_aura.cc b/chrome/browser/ui/window_sizer_aura.cc index 07354c3..e4e8d53 100644 --- a/chrome/browser/ui/window_sizer_aura.cc +++ b/chrome/browser/ui/window_sizer_aura.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -23,8 +23,8 @@ class DefaultMonitorInfoProvider : public WindowSizer::MonitorInfoProvider { } virtual gfx::Rect GetPrimaryMonitorBounds() const { - aura::Window* desktop_window = aura::Desktop::GetInstance()->window(); - return desktop_window->bounds(); + aura::Desktop* desktop = aura::Desktop::GetInstance(); + return gfx::Rect(desktop->GetHostSize()); } virtual gfx::Rect GetMonitorWorkAreaMatching( |