Revert 54073 - Fix --kiosk to work regardless of the startup pref setting or ...

chrome/browser/browser_init.cc

Index: chrome/browser/browser_init.cc
===================================================================
--- chrome/browser/browser_init.cc	(revision 54094)
+++ chrome/browser/browser_init.cc	(working copy)
@@ -552,17 +552,13 @@
     RecordLaunchModeHistogram(LM_AS_WEBAPP);
   }
 
-#if !defined(OS_MACOSX)
-  // In kiosk mode, we want to always be fullscreen, so switch to that now.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
-    BrowserList::GetLastActive()->ToggleFullscreenMode();
-#endif
-
 #if defined(OS_WIN)
   // Print the selected page if the command line switch exists. Note that the
   // current selected tab would be the page which will be printed.
-  if (command_line_.HasSwitch(switches::kPrint))
-    BrowserList::GetLastActive()->Print();
+  if (command_line_.HasSwitch(switches::kPrint)) {
+    Browser* browser = BrowserList::GetLastActive();
+    browser->Print();
+  }
 #endif
 
   // If we're recording or playing back, startup the EventRecorder now
@@ -746,6 +742,12 @@
 #endif
   }
 
+#if !defined(OS_MACOSX)
+  // In kiosk mode, we want to always be fullscreen, so switch to that now.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
+    browser->ToggleFullscreenMode();
+#endif
+
   bool first_tab = true;
   for (size_t i = 0; i < tabs.size(); ++i) {
     // We skip URLs that we'd have to launch an external protocol handler for.