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

chrome/browser/ui/web_applications/web_app_ui.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/ui/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/app_launch_manifest_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 359 matching lines @@
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 void UpdateShortcutInfoForApp(const extensions::Extension& app,
                               Profile* profile,
                               ShellIntegration::ShortcutInfo* shortcut_info) {
   shortcut_info->extension_id = app.id();
   shortcut_info->is_platform_app = app.is_platform_app();
-  shortcut_info->url = GURL(app.launch_web_url());
+  shortcut_info->url = GURL(extensions::AppLaunchInfo::GetLaunchWebUrl(&app));
   shortcut_info->title = UTF8ToUTF16(app.name());
   shortcut_info->description = UTF8ToUTF16(app.description());
   shortcut_info->extension_path = app.path();
   shortcut_info->profile_path = profile->GetPath();
 }
 
 void UpdateShortcutInfoAndIconForApp(
     const extensions::Extension& extension,
     Profile* profile,
     const web_app::ShortcutInfoCallback& callback) {
@@ skipping 35 matching lines @@
   }
 
   // |info_list| may still be empty at this point, in which case LoadImage
   // will call the OnImageLoaded callback with an empty image and exit
   // immediately.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list,
       base::Bind(&OnImageLoaded, shortcut_info, callback));
 }
 
 }  // namespace web_app