diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 13:58:14 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 13:58:14 +0000 |
| commit | 2c5db9ee28da42605ee733c62cea423d75dc79c2 (patch) | |
| tree | 5d8240db8f52174a19dd4f79013ca133bd48331d /ash/root_window_controller.h | |
| parent | 26f90f3a850f4e1ee48c57d87526fbf2f786ce79 (diff) | |
| download | chromium_src-2c5db9ee28da42605ee733c62cea423d75dc79c2.zip chromium_src-2c5db9ee28da42605ee733c62cea423d75dc79c2.tar.gz chromium_src-2c5db9ee28da42605ee733c62cea423d75dc79c2.tar.bz2 | |
Use active window if on current workspace for fullscreen mode.
BUG=330566,340647
TEST=WindowSelectorTest.FullscreenWindow,RootWindowControllerTest.GetWindowForFullscreenMode,RootWindowControllerTest.MultipleDisplaysGetWindowForFullscreenMode,PanelWindowResizerTest.AttachToSecondFullscreenDisplay
TEST=Open a panel and navigate a browser to an html5 fullscreen page, and fullscreen it. Alt+tab to the panel, should be able to see the panel.
Review URL: https://codereview.chromium.org/149493008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.h')
| -rw-r--r-- | ash/root_window_controller.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index b6a1a29..8ec271d 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -112,7 +112,12 @@ class ASH_EXPORT RootWindowController : public ShellObserver { virtual ~RootWindowController(); aura::Window* root_window() { return dispatcher()->window(); } + const aura::Window* root_window() const { return dispatcher()->window(); } + aura::WindowEventDispatcher* dispatcher() { return dispatcher_.get(); } + const aura::WindowEventDispatcher* dispatcher() const { + return dispatcher_.get(); + } RootWindowLayoutManager* root_window_layout() { return root_window_layout_; } |