| 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 531011e7b34f7fd1fd2fe034aa3d2f4977cfc1d7..de6c14029f13a0f5e02e38bf422b74b89464f83c 100644
|
| --- a/chrome/browser/ui/views/frame/browser_frame_ash.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
|
| @@ -63,13 +63,21 @@ BrowserFrameAsh::BrowserFrameAsh(BrowserFrame* browser_frame,
|
| window_state->SetDelegate(
|
| scoped_ptr<ash::wm::WindowStateDelegate>(
|
| new BrowserWindowStateDelegate(browser)).Pass());
|
| - window_state->set_animate_to_fullscreen(!browser->is_type_tabbed());
|
|
|
| // Turn on auto window management if we don't need an explicit bounds.
|
| // This way the requested bounds are honored.
|
| if (!browser->bounds_overridden() && !browser->is_session_restore())
|
| SetWindowAutoManaged();
|
| #if defined(OS_CHROMEOS)
|
| + if (browser->is_type_tabbed()) {
|
| + // Animating to immersive fullscreen does not look good. Immersive
|
| + // fullscreen is the default fullscreen type on ChromeOS for tabbed browser
|
| + // windows. The WindowState constructor disables animating to fullscreen
|
| + // completely when the kAshEnableImmersiveFullscreenForAllWindows command
|
| + // line flag is set.
|
| + window_state->set_animate_to_fullscreen(false);
|
| + }
|
| +
|
| // For legacy reasons v1 apps (like Secure Shell) are allowed to consume keys
|
| // like brightness, volume, etc. Otherwise these keys are handled by the
|
| // Ash window manager.
|
|
|