Move immersive fullscreen check into ImmersiveFullscreenConfiguration.

chrome/browser/ui/immersive_fullscreen_configuration.cc

Index: chrome/browser/ui/immersive_fullscreen_configuration.cc
diff --git a/chrome/browser/ui/immersive_fullscreen_configuration.cc b/chrome/browser/ui/immersive_fullscreen_configuration.cc
index 7905978b38c7dff455644bbb7283cf611e0b67b4..f43ca5b62fd60fa6b40f86b5aa9a5c19635c740f 100644
--- a/chrome/browser/ui/immersive_fullscreen_configuration.cc
+++ b/chrome/browser/ui/immersive_fullscreen_configuration.cc
@@ -4,6 +4,34 @@
 
 #include "chrome/browser/ui/immersive_fullscreen_configuration.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/ash_switches.h"
+#include "base/command_line.h"
+#include "chrome/common/chrome_switches.h"
+#endif  // defined(OS_CHROMEOS)
+
+// static
+bool ImmersiveFullscreenConfiguration::UseImmersiveFullscreen() {
+#if defined(OS_CHROMEOS)
+  CommandLine* command = CommandLine::ForCurrentProcess();
+  // Kiosk mode needs the whole screen.
+  if (command->HasSwitch(switches::kKioskMode))
+    return false;
+  // Immersive fullscreen is on by default. If you change the default you must
+  // change the enable function below and BrowserTest FullscreenBookmarkBar
+  // (which cannot depend on this function due to DEPS).
+  return !command->HasSwitch(ash::switches::kAshDisableImmersiveFullscreen);
+#endif
+  return false;
+}
+
+// static
+// Implemented here so all the code dealing with flags lives in one place.
+void ImmersiveFullscreenConfiguration::EnableImmersiveFullscreenForTest() {
+  // Immersive fullscreen is on by default. If we turn it off, this function
+  // will need to add kAshEnableImmersiveFullscreen to the command line.
+}
+
 int ImmersiveFullscreenConfiguration::immersive_mode_reveal_delay_ms_ = 200;
 int
 ImmersiveFullscreenConfiguration::immersive_mode_reveal_x_threshold_pixels_ = 3;