diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 06:22:06 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 06:22:06 +0000 |
| commit | e3bc88e953e5e07a9aed2d6fba2295dc8607bfaf (patch) | |
| tree | 470febbdd14f79d194371fb8caa7d15bcf793718 /ash/shelf | |
| parent | 65059c07969fe76ac20270faab1d289210a2e18c (diff) | |
| download | chromium_src-e3bc88e953e5e07a9aed2d6fba2295dc8607bfaf.zip chromium_src-e3bc88e953e5e07a9aed2d6fba2295dc8607bfaf.tar.gz chromium_src-e3bc88e953e5e07a9aed2d6fba2295dc8607bfaf.tar.bz2 | |
RootWindowController::GetFullscreenWindow() should return the active one.
It returned the fullscreen window (if any) in the active workspace,
and a workspace could contain only one fullscreen window at most.
However, now there's only one desktop workspace which can contain
multiple fullscreen windows.
To follow the past state, it would be better to return the active
fullscreen window first.
TEST=covered by ash_unittests
R=oshima@chromium.org, sky@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/23534049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 9d3b52e..1ea2d98 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -525,7 +525,7 @@ bool ShelfLayoutManager::FullscreenWithMinimalChrome() const { RootWindowController* controller = GetRootWindowController(root_window_); if (!controller) return false; - const aura::Window* window = controller->GetFullscreenWindow(); + const aura::Window* window = controller->GetTopmostFullscreenWindow(); if (!window) return false; if (!window->GetProperty(kFullscreenUsesMinimalChromeKey)) |