Move the parsing of app.launch related keys out of Extension class.

chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.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/kiosk_mode/kiosk_mode_screensaver.h"
 
 #include "ash/screensaver/screensaver_view.h"
 #include "ash/shell.h"
 #include "ash/wm/user_activity_detector.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
 using extensions::Extension;
 using extensions::SandboxedUnpacker;
 
 namespace chromeos {
 
@@ skipping 179 matching lines @@
   if (chromeos::UserManager::Get()->IsUserLoggedIn())
     return;
 
   ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);
 
   Profile* default_profile = ProfileManager::GetDefaultProfile();
   // Add the extension to the extension service and display the screensaver.
   if (default_profile) {
     extensions::ExtensionSystem::Get(default_profile)->extension_service()->
         AddExtension(extension);
-    ash::ShowScreensaver(extension->GetFullLaunchURL());
+    ash::ShowScreensaver(
+        extensions::AppLauncherInfo::GetFullLaunchURL(extension));
   } else {
     LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!";
     ShutdownKioskModeScreensaver();
   }
 }
 
 void KioskModeScreensaver::OnUserActivity() {
   // We don't want to handle further user notifications; we'll either login
   // the user and close out or or at least close the screensaver.
   ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
@@ skipping 36 matching lines @@
 
   g_kiosk_mode_screensaver = new KioskModeScreensaver();
 }
 
 void ShutdownKioskModeScreensaver() {
   delete g_kiosk_mode_screensaver;
   g_kiosk_mode_screensaver = NULL;
 }
 
 }  // namespace chromeos