Index: chrome/browser/ui/views/frame/browser_frame_ash.cc |
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc |
index d457dcea390a9829277841976d4dc121166a361f..5b98d0996d215c15655caa58852f6234062abd5d 100644 |
--- a/chrome/browser/ui/views/frame/browser_frame_ash.cc |
+++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc |
@@ -30,12 +30,16 @@ class BrowserWindowStateDelegate : public ash::wm::WindowStateDelegate { |
virtual ~BrowserWindowStateDelegate(){} |
// Overridden from ash::wm::WindowStateDelegate. |
- virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE { |
- DCHECK(window_state->IsFullscreen() || window_state->CanMaximize()); |
- // Windows which cannot be maximized should not be fullscreened. |
- if (!window_state->IsFullscreen() && !window_state->CanMaximize()) |
- return true; |
- chrome::ToggleFullscreenMode(browser_); |
+ virtual bool EnterImmersiveFullscreen( |
+ ash::wm::WindowState* window_state) OVERRIDE { |
+ // Immersive fullscreen is the same as browser fullscreen. |
+ if (!window_state->IsFullscreen()) |
+ chrome::ToggleFullscreenMode(browser_); |
+ return true; |
+ } |
+ virtual bool ExitFullscreen(ash::wm::WindowState* window_state) OVERRIDE { |
+ if (window_state->IsFullscreen()) |
+ chrome::ToggleFullscreenMode(browser_); |
return true; |
} |
private: |