summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 00:54:30 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 00:54:30 +0000
commit9ab69faefaef052fa43e8cc2f0902f2d01835dc6 (patch)
tree70616a307c749d9b01e1b08496801eaea3e50169 /ash
parentda128f857dceb670ce0be420483849e0c21f1423 (diff)
downloadchromium_src-9ab69faefaef052fa43e8cc2f0902f2d01835dc6.zip
chromium_src-9ab69faefaef052fa43e8cc2f0902f2d01835dc6.tar.gz
chromium_src-9ab69faefaef052fa43e8cc2f0902f2d01835dc6.tar.bz2
Enable the task manager to be put into immersive fullscreen
BUG=307622 TEST=AcceleratorCommandsBrowserTest.ToggleFullscreen Manual 1) Enable "Enable immersive fullscreen for non browser windows" in chrome://flags 2) Open the task manager 3) With the task manager having focus, hit <F4>. Check that the window goes fullscreen 4) Hover the mouse at the top of the screen. Check that the window controls slide onscreen 5) Hit <F4> again. Check that the window exits fullscreen. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=239403 R=benwells@chromium.org, oshima@chromium.org Review URL: https://codereview.chromium.org/84743003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/wm/custom_frame_view_ash.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc
index c4b58d5..268a4d2 100644
--- a/ash/wm/custom_frame_view_ash.cc
+++ b/ash/wm/custom_frame_view_ash.cc
@@ -51,7 +51,7 @@ class CustomFrameViewAshWindowStateDelegate
CustomFrameViewAshWindowStateDelegate(
ash::wm::WindowState* window_state,
ash::CustomFrameViewAsh* custom_frame_view)
- : window_state_(window_state) {
+ : window_state_(NULL) {
#if defined(OS_CHROMEOS)
// TODO(pkotwicz): Investigate if immersive fullscreen can be enabled for
// Windows Ash.
@@ -67,8 +67,9 @@ class CustomFrameViewAshWindowStateDelegate
// WindowState::ToggleFullscreen(). This is the case when exiting
// immersive fullscreen via the "Restore" window control.
// TODO(pkotwicz): This is a hack. Remove ASAP. http://crbug.com/319048
- window_state->AddObserver(this);
- window_state->window()->AddObserver(this);
+ window_state_ = window_state;
+ window_state_->AddObserver(this);
+ window_state_->window()->AddObserver(this);
}
#endif
}