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 1fd4f9a730939d58e589f4e6063005984ca858f6..9384f1613d57a6ecda81d5db348c780879e58998 100644 |
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc |
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
@@ -35,6 +35,7 @@ |
#include "chrome/browser/ui/browser_finder.h" |
#include "chrome/browser/ui/browser_window.h" |
#include "chrome/browser/ui/host_desktop.h" |
+#include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/time_format.h" |
@@ -62,17 +63,6 @@ ChromeShellDelegate::~ChromeShellDelegate() { |
instance_ = NULL; |
} |
-// static |
-bool ChromeShellDelegate::UseImmersiveFullscreen() { |
-#if defined(OS_CHROMEOS) |
- // Kiosk mode needs the whole screen. |
- CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- return !command_line->HasSwitch(switches::kKioskMode) && |
- command_line->HasSwitch(ash::switches::kAshImmersiveFullscreen); |
-#endif |
- return false; |
-} |
- |
bool ChromeShellDelegate::IsMultiProfilesEnabled() const { |
return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles); |
} |
@@ -110,7 +100,7 @@ void ChromeShellDelegate::ToggleMaximized() { |
// TODO(jamescook): If immersive mode replaces fullscreen, rename this |
// function and the interface to ToggleFullscreen. |
- if (UseImmersiveFullscreen()) { |
+ if (chrome::UseImmersiveFullscreen()) { |
chrome::ToggleFullscreenMode(GetTargetBrowser()); |
return; |
} |