Integrate Kiosk Mode with enterprise policies.

chrome/browser/chromeos/ui/screensaver_extension_dialog.cc

Index: chrome/browser/chromeos/ui/screensaver_extension_dialog.cc
diff --git a/chrome/browser/chromeos/ui/screensaver_extension_dialog.cc b/chrome/browser/chromeos/ui/screensaver_extension_dialog.cc
index b8e02a64a1dcf7f014f63668756f1f33edad44da..88a2f27c74c0c992edddc0c3a25bbfe62d8558e6 100644
--- a/chrome/browser/chromeos/ui/screensaver_extension_dialog.cc
+++ b/chrome/browser/chromeos/ui/screensaver_extension_dialog.cc
@@ -60,8 +60,8 @@ void ScreensaverExtensionDialog::LoadExtension() {
   // We can't get the screensaver path till the helper is ready.
   if (!chromeos::KioskModeHelper::Get()->is_initialized()) {
     chromeos::KioskModeHelper::Get()->Initialize(
-            base::Bind(&ScreensaverExtensionDialog::LoadExtension,
-                       base::Unretained(this)));
+        base::Bind(&ScreensaverExtensionDialog::LoadExtension,
+                   base::Unretained(this)));

[Mattias Nissler (ping if slow), 2012/03/16 09:56:46]

How do you ensure that the dialog object is till alive when the callback fires?

[rkc, 2012/03/19 23:59:48]

g_instance is alive for the lifetime of chrome; so the object should always be
alive.

     return;
   }
 
@@ -76,8 +76,8 @@ void ScreensaverExtensionDialog::LoadExtension() {
           &error);
 
   if (!screensaver_extension) {
-    LOG(ERROR) << "Could not load screensaver extension from: " <<
-        chromeos::KioskModeHelper::Get()->GetScreensaverPath();
+    LOG(ERROR) << "Could not load screensaver extension from: "
+               << chromeos::KioskModeHelper::Get()->GetScreensaverPath();
     return;
   }