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

chrome/browser/browser_init.cc

 // Copyright (c) 2010 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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 534 matching lines @@
 #if defined(OS_MACOSX)
       // Check whether the auto-update system needs to be promoted from user
       // to system.
       KeystoneInfoBar::PromotionInfoBar(profile);
 #endif
     }
   } else {
     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
   // unless otherwise specified.
   if (!command_line_.HasSwitch(switches::kNoEvents)) {
     FilePath script_path;
     PathService::Get(chrome::FILE_RECORDED_SCRIPT, &script_path);
 
     bool record_mode = command_line_.HasSwitch(switches::kRecordMode);
     bool playback_mode = command_line_.HasSwitch(switches::kPlaybackMode);
@@ skipping 163 matching lines @@
     browser = Browser::Create(profile_);
   } else {
 #if defined(TOOLKIT_GTK)
     // Setting the time of the last action on the window here allows us to steal
     // focus, which is what the user wants when opening a new tab in an existing
     // browser window.
     gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeHandle());
 #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.
     // This avoids us getting into an infinite loop asking ourselves to open
     // a URL, should the handler be (incorrectly) configured to be us. Anyone
     // asking us to open such a URL should really ask the handler directly.
     if (!process_startup && !URLRequest::IsHandledURL(tabs[i].url))
       continue;
 
     int add_types = first_tab ? TabStripModel::ADD_SELECTED :
@@ skipping 291 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }