Integrate Kiosk Mode with enterprise policies.

chrome/browser/chromeos/ui/screensaver_extension_dialog.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/ui/screensaver_extension_dialog.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
@@ skipping 42 matching lines @@
 ScreensaverExtensionDialog::ScreensaverExtensionDialog()
     : screensaver_extension_(NULL),
       loading_extension_(false) {
 }
 
 void ScreensaverExtensionDialog::LoadExtension() {
   // If the helper is not initialized, call us again when it is.
   // 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;
   }
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   std::string error;
 
   scoped_refptr<Extension> screensaver_extension =
       extension_file_util::LoadExtension(
           FilePath(chromeos::KioskModeHelper::Get()->GetScreensaverPath()),
           Extension::COMPONENT,
           Extension::NO_FLAGS,
           &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;
   }
 
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(
                               &ScreensaverExtensionDialog::SetExtensionAndShow,
                               base::Unretained(this),
                               screensaver_extension));
 }
@@ skipping 66 matching lines @@
           base::Unretained(this)));
   dialog->Close();
 }
 
 void ScreensaverExtensionDialog::ReloadAndShow() {
   ProfileManager::GetDefaultProfile()->GetExtensionService()->ReloadExtension(
       screensaver_extension_->id());
 
   Show();
 }