Create Login UI for Demo User.

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"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 
 using content::BrowserThread;
@@ skipping 28 matching lines @@
   if (g_instance)
     g_instance->Close();
 }
 
 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,

[pastarmovj, 2012/03/05 15:22:25]

Too much indentation.

[rkc, 2012/03/16 00:17:33]

Done.

+                       base::Unretained(this)));
+    return;
+  }
+
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   std::string error;
-  std::string extension_path = CommandLine::ForCurrentProcess()->
-      GetSwitchValueASCII(switches::kKioskModeScreensaverPath);
 
   scoped_refptr<Extension> screensaver_extension =
       extension_file_util::LoadExtension(
-          FilePath(extension_path),
+          FilePath(chromeos::KioskModeHelper::Get()->GetScreensaverPath()),
           Extension::COMPONENT,
           Extension::NO_FLAGS,
           &error);
 
   if (!screensaver_extension) {
     LOG(ERROR) << "Could not load screensaver extension from: " <<

[pastarmovj, 2012/03/05 15:22:25]

The last << goes on the next line and aligns with the previous <<.

[rkc, 2012/03/16 00:17:33]

Done.

-        extension_path;
+        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();
 }