summaryrefslogtreecommitdiffstats
path: root/chrome/browser/fullscreen_chromeos.cc
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 06:22:06 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 06:22:06 +0000
commite3bc88e953e5e07a9aed2d6fba2295dc8607bfaf (patch)
tree470febbdd14f79d194371fb8caa7d15bcf793718 /chrome/browser/fullscreen_chromeos.cc
parent65059c07969fe76ac20270faab1d289210a2e18c (diff)
downloadchromium_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 'chrome/browser/fullscreen_chromeos.cc')
-rw-r--r--chrome/browser/fullscreen_chromeos.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/fullscreen_chromeos.cc b/chrome/browser/fullscreen_chromeos.cc
index a2adffa..448fdc1 100644
--- a/chrome/browser/fullscreen_chromeos.cc
+++ b/chrome/browser/fullscreen_chromeos.cc
@@ -9,5 +9,5 @@
bool IsFullScreenMode() {
ash::internal::RootWindowController* controller =
ash::internal::RootWindowController::ForActiveRootWindow();
- return controller && controller->GetFullscreenWindow();
+ return controller && controller->GetTopmostFullscreenWindow();
}