Integrate Kiosk Mode with enterprise policies.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2012 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/chromeos/chrome_browser_main_chromeos.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/disks/disk_mount_manager.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/session_manager_observer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
 #include "chrome/browser/chromeos/power/brightness_observer.h"
 #include "chrome/browser/chromeos/power/resume_observer.h"
@@ skipping 159 matching lines @@
       if (dimensions.size() == 2) {
         int width, height;
         if (base::StringToInt(dimensions[0], &width) &&
             base::StringToInt(dimensions[1], &height))
           size.SetSize(width, height);
       }
     }
 
     browser::ShowLoginWizard(first_screen, size);
 
-    if (chromeos::KioskModeHelper::IsKioskModeEnabled())
+    if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
       chromeos::InitializeKioskModeScreensaver();
   } else if (parsed_command_line.HasSwitch(switches::kLoginUser) &&
       parsed_command_line.HasSwitch(switches::kLoginPassword)) {
     chromeos::BootTimesLoader::Get()->RecordLoginAttempted();
     new StubLogin(
         parsed_command_line.GetSwitchValueASCII(switches::kLoginUser),
         parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword));
   } else {
     if (!parsed_command_line.HasSwitch(switches::kTestName)) {
       // We did not log in (we crashed or are debugging), so we need to
       // restore Sync.
       chromeos::LoginUtils::Get()->RestoreAuthenticationSession(profile);
     }
   }
 }
 
 // ChromeBrowserMainPartsChromeos ----------------------------------------------
 
 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsLinux(parameters) {
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
-  if (chromeos::KioskModeHelper::IsKioskModeEnabled())
+  if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
     chromeos::ShutdownKioskModeScreensaver();
   cryptohome::AsyncMethodCaller::Shutdown();
   chromeos::disks::DiskMountManager::Shutdown();
 
   // CrosLibrary is shut down before DBusThreadManager even though the former
   // is initialized before the latter becuase some of its libraries depend
   // on DBus clients.
   // TODO(hashimoto): Resolve this situation by removing CrosLibrary.
   // (crosbug.com/26160)
   if (!parameters().ui_task && chromeos::CrosLibrary::Get())
@@ skipping 114 matching lines @@
 #endif
 
   // Trigger prefetching of ownership status.
   chromeos::OwnershipService::GetSharedInstance()->Prewarm();
 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just before CreateProfile().
 
   // Initialize the screen locker now so that it can receive
   // LOGIN_USER_CHANGED notification from UserManager.
-  if (chromeos::KioskModeHelper::IsKioskModeEnabled()) {
+  if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     chromeos::InitializeKioskModeIdleLogout();
   } else {
     chromeos::ScreenLocker::InitClass();
   }
 
   // This forces the ProfileManager to be created and register for the
   // notification it needs to track the logged in user.
   g_browser_process->profile_manager();
 
   // TODO(abarth): Should this move to InitializeNetworkOptions()?
@@ skipping 162 matching lines @@
   // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell
   // singleton before the shell is destroyed.
   video_property_writer_.reset();
   // Remove PowerButtonObserver attached to a D-Bus client before
   // DBusThreadManager is shut down.
   power_button_observer_.reset();
 #endif
 
   ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
 }