Index: chrome/browser/ui/ash/chrome_shell_delegate.cc |
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
index c94e533de75fbb760f28026085bcb6b8e69f71a8..a8ca4cf8e33c5abb6bdc4e422ec3bd09ff36fb3f 100644 |
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc |
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
@@ -151,6 +151,7 @@ void ChromeShellDelegate::NewWindow(bool is_incognito) { |
chrome::HOST_DESKTOP_TYPE_ASH); |
} |
+#if 0 |
void ChromeShellDelegate::ToggleFullscreen() { |
// Only toggle if the user has a window open. |
aura::Window* window = ash::wm::GetActiveWindow(); |
@@ -166,26 +167,7 @@ void ChromeShellDelegate::ToggleFullscreen() { |
Browser* browser = chrome::FindBrowserWithWindow(window); |
if (browser) { |
- // If a window is fullscreen, exit fullscreen. |
- if (is_fullscreen) { |
- chrome::ToggleFullscreenMode(browser); |
- return; |
- } |
- |
- // AppNonClientFrameViewAsh shows only the window controls and no other |
- // window decorations which is pretty close to fullscreen. Put v1 apps |
- // into maximized mode instead of fullscreen to avoid showing the ugly |
- // fullscreen exit bubble. |
-#if defined(OS_WIN) |
- if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) { |
- chrome::ToggleFullscreenMode(browser); |
- return; |
- } |
-#endif // OS_WIN |
- if (browser->is_app() && browser->app_type() != Browser::APP_TYPE_CHILD) |
- window_state->ToggleMaximized(); |
- else |
- chrome::ToggleFullscreenMode(browser); |
+ chrome::ToggleFullscreenMode(browser); |
return; |
} |
@@ -199,6 +181,7 @@ void ChromeShellDelegate::ToggleFullscreen() { |
shell_window->Fullscreen(); |
} |
} |
+#endif |
void ChromeShellDelegate::RestoreTab() { |
if (tab_restore_helper_.get()) { |