Move immersive fullscreen check into ImmersiveFullscreenConfiguration.

chrome/browser/ui/views/frame/immersive_mode_controller_factory.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 
 #include "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/ash_switches.h"
-#include "base/command_line.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
-#include "chrome/common/chrome_switches.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace chrome {
 
-bool 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;
-}
-
 // Implemented here so all the code dealing with flags lives in one place.
 void EnableImmersiveFullscreenForTest() {

[James Cook, 2013/05/27 12:00:20]

I would move this function to the ImmersiveFullscreenConfiguration class as
well.

[tfarina, 2013/05/29 02:03:52]

Done.

   // Immersive fullscreen is on by default. If we turn it off, this function
   // will need to add kAshEnableImmersiveFullscreen to the command line.
 }
 
 ImmersiveModeController* CreateImmersiveModeController() {
 #if defined(OS_CHROMEOS)
   return new ImmersiveModeControllerAsh();
 #else
   return new ImmersiveModeControllerStub();
 #endif
 }
 
 }  // namespace chrome