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

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_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/ui/ash/launcher/app_shortcut_launcher_item_controller.h"
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/extensions/app_launch_manifest_handler.h"
 #include "content/public/browser/web_contents.h"
 
 using extensions::Extension;
 
 // Item controller for an app shortcut. Shortcuts track app and launcher ids,
 // but do not have any associated windows (opening a shortcut will replace the
 // item with the appropriate LauncherItemController type).
 AppShortcutLauncherItemController::AppShortcutLauncherItemController(
     const std::string& app_id,
     ChromeLauncherControllerPerApp* controller)
     : LauncherItemController(TYPE_SHORTCUT, app_id, controller),
       app_controller_(controller) {
   // To detect V1 applications we use their domain and match them against the
   // used URL. This will also work with applications like Google Drive.
   const Extension* extension =
       launcher_controller()->GetExtensionForAppID(app_id);
-  // Some unit tests have no real extension and will set their
-  if (extension)
-    refocus_url_ = GURL(extension->launch_web_url() + "*");
+  // Some unit tests have no real extension.
+  if (extension) {
+    refocus_url_ =
+        GURL(extensions::AppLaunchInfo::GetLaunchWebUrl(extension) + "*");
+  }
 }
 
 AppShortcutLauncherItemController::~AppShortcutLauncherItemController() {
 }
 
 string16 AppShortcutLauncherItemController::GetTitle() {
   return GetAppTitle();
 }
 
 bool AppShortcutLauncherItemController::HasWindow(aura::Window* window) const {
@@ skipping 121 matching lines @@
            refocus_pattern.MatchesURL(tab_url)) ||
           (extension->OverlapsWithOrigin(tab_url) &&
            extension->web_extent().MatchesURL(tab_url)) ||
           launcher_controller()->GetPerAppInterface()->
              IsWebContentHandledByApplication(web_contents, app_id()))
         items.push_back(web_contents);
     }
   }
   return items;
 }