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

chrome/browser/chromeos/screensaver/screensaver_controller.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/screensaver/screensaver_controller.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/logging.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/notification_service.h"
 
 namespace {
 
 const int kScreensaverTimeoutMinutes = 2;
 
 ExtensionService* GetDefaultExtensionService() {
@@ skipping 99 matching lines @@
       break;
     }
   }
 }
 
 void ScreensaverController::IdleNotify(int64 threshold) {
   ExtensionService* service = GetDefaultExtensionService();
   const extensions::Extension* screensaver_extension =
       service->GetExtensionById(screensaver_extension_id_,
                                 ExtensionService::INCLUDE_ENABLED);
-  ash::ShowScreensaver(screensaver_extension->GetFullLaunchURL());
+  ash::ShowScreensaver(
+      extensions::AppLauncherInfo::GetFullLaunchURL(screensaver_extension));
 
   if (!ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))
     ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);
 }
 
 void ScreensaverController::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.
   if (ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))
     ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
@@ skipping 28 matching lines @@
   ash::CloseScreensaver();
   screensaver_extension_id_ = "";
 }
 
 void ScreensaverController::RequestNextIdleNotification() {
   DBusThreadManager::Get()->GetPowerManagerClient()->
       RequestIdleNotification(threshold_.InMilliseconds());
 }
 
 }  // namespace chromeos